diff options
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java | 103 |
1 files changed, 92 insertions, 11 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java index d103411..fa4d95f 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java +++ b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/NdctxbConfiguration.java @@ -18,21 +18,27 @@ package org.onap.pomba.contextbuilder.networkdiscovery; +import java.net.InetAddress; import java.util.Base64; + import org.eclipse.jetty.util.security.Password; +import org.onap.pomba.contextbuilder.networkdiscovery.exception.DiscoveryException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @Component public class NdctxbConfiguration { + private static Logger log = LoggerFactory.getLogger(NdctxbConfiguration.class); // Network Discover Configuration values @Value("${networkDiscoveryCtxBuilder.userId:admin}") private String networkDiscoveryCtxBuilderUserId; - @Value("${networkDiscoveryCtxBuilder.password:admin}") + @Value("${networkDiscoveryCtxBuilder.password:OBF:1u2a1toa1w8v1tok1u30}") private String networkDiscoveryCtxBuilderPassword; // Service Decomposition Configuration values @@ -52,27 +58,102 @@ public class NdctxbConfiguration { @Value("${serviceDecomposition.userId:admin}") private String serviceDecompositionUserId; - @Value("${serviceDecomposition.password:admin}") + @Value("${serviceDecomposition.password:OBF:1u2a1toa1w8v1tok1u30}") private String serviceDecompositionPassword; - @Bean(name="serviceDecompositionBaseUrl") + @Bean(name = "serviceDecompositionBaseUrl") public String getURL() { - String url = this.serviceDecompositionHttpProtocol + "://" - + this.serviceDecompositionHost + ":" - + this.serviceDecompositionPort - + this.serviceDecompositionServiceInstancePath; + String url = this.serviceDecompositionHttpProtocol + "://" + this.serviceDecompositionHost + ":" + + this.serviceDecompositionPort + this.serviceDecompositionServiceInstancePath; return url; } - @Bean(name="serviceDecompositionBasicAuthorization") + @Bean(name = "serviceDecompositionBasicAuthorization") public String getSdBasicAuth() { - String auth = new String(this.serviceDecompositionUserId + ":" + Password.deobfuscate(this.serviceDecompositionPassword)); + String auth = this.serviceDecompositionUserId + ":" + Password.deobfuscate(this.serviceDecompositionPassword); return ("Basic " + Base64.getEncoder().encodeToString(auth.getBytes())); } - @Bean(name="networkDiscoveryCtxBuilderBasicAuthorization") + @Bean(name = "networkDiscoveryCtxBuilderBasicAuthorization") public String getNdBasicAuth() { - String auth = this.networkDiscoveryCtxBuilderUserId + ":" + Password.deobfuscate(this.networkDiscoveryCtxBuilderPassword); + String auth = this.networkDiscoveryCtxBuilderUserId + ":" + + Password.deobfuscate(this.networkDiscoveryCtxBuilderPassword); + return ("Basic " + Base64.getEncoder().encodeToString(auth.getBytes())); + } + + /* Network Discovery related */ + @Value("${networkDiscoveryMicroService.host}") + private String networkDiscoveryMicroServiceHost; + + @Value("${networkDiscoveryMicroService.port}") + private String networkDiscoveryMicroServicePort; + + @Value("${networkDiscoveryMicroService.httpProtocol}") + private String httpNetworkDiscoveryMicroServiceProtocol; + + @Value("${networkDiscoveryMicroService.networkDiscoveryPath}") + private String networkDiscoveryMicroServicePath; + + @Value("${networkDiscoveryMicroService.responseTimeOutInMilliseconds}") + private String networkDiscoveryResponseTimeOutInMilliseconds; + + @Bean(name = "networkDiscoveryMicroServiceBaseUrl") + public String getNetworkDiscoveryURL() { + String url = this.httpNetworkDiscoveryMicroServiceProtocol + "://" + this.networkDiscoveryMicroServiceHost + ":" + + this.networkDiscoveryMicroServicePort + this.networkDiscoveryMicroServicePath; + return url; + } + + @Bean(name = "ndResponseTimeOutInMilliseconds") + public long getNdResponseTimeOutInMilliseconds() { + long timeoutV = Integer.parseUnsignedInt(this.networkDiscoveryResponseTimeOutInMilliseconds); + return timeoutV; + } + + @Bean(name = "networkDiscoveryMicroServiceHostAndPort") + public String getNetworkDiscoveryMicroServiceHostAndPort() { + String hostNPort = this.networkDiscoveryMicroServiceHost + ":" + this.networkDiscoveryMicroServicePort; + return hostNPort; + } + + /* Network Discovery Context Builder related */ + @Value("${server.port:8080}") + private int networkDiscoveryCtxBuilderPort; + + @Value("${networkDiscoveryCtxBuilder.httpProtocol}") + private String httpNetworkDiscoveryCtxBuilderProtocol; + + @Bean(name = "networkDiscoveryCtxBuilderPort") + public String getNetworkDiscoveryCtxBuilderPort() { + return Integer.toString(networkDiscoveryCtxBuilderPort); + } + + @Bean(name = "networkDiscoveryCtxBuilderBaseUrl") + public String getNetworkDiscoveryCtxBuilderBaseUrl() throws DiscoveryException { + String url = null; + try { + String localIp = InetAddress.getLocalHost().getHostAddress(); + url = this.httpNetworkDiscoveryCtxBuilderProtocol + "://" + localIp + ":" + + getNetworkDiscoveryCtxBuilderPort(); + } catch (Exception e) { + log.error("Unable to obtain localIp: " + e.getMessage()); + throw new DiscoveryException(e.getMessage(), e); + } + + return url; + } + + // Network Discovery Configuration values + @Value("${networkDiscoveryMicroService.userId:admin}") + private String networkDiscoveryMicroServiceUserId; + + @Value("${networkDiscoveryMicroService.password:OBF:1u2a1toa1w8v1tok1u30}") + private String networkDiscoveryMicroServicePassword; + + @Bean(name = "networkDiscoveryMicroServiceBasicAuthorization") + public String getNetworkDiscoveryMicroServiceBasicAuth() { + String auth = this.networkDiscoveryMicroServiceUserId + ":" + + Password.deobfuscate(this.networkDiscoveryMicroServicePassword); return ("Basic " + Base64.getEncoder().encodeToString(auth.getBytes())); } |