Mutlicloud config aligned with global so config

Mutlicloud config aligned with global so config

Issue-ID: SO-3643
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I1adb99cae66c1daf3ca61c49da5908f310da7297

diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MulticloudConfiguration.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MulticloudConfiguration.java
index 6107681..0890739 100644 (file)
--- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MulticloudConfiguration.java
+++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MulticloudConfiguration.java
@@ -7,14 +7,10 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class MulticloudConfiguration {
 
-    @Value("${multicloud.protocol}")
-    private String protocol;
-    @Value("${multicloud.host}")
-    private String host;
-    @Value("${multicloud.port}")
-    private Integer port;
+    @Value("${multicloud.endpoint}")
+    private String endpoint;
 
     public String getMulticloudUrl() {
-        return protocol + "://" + host + ":" + port;
+        return endpoint;
     }
 }

diff --git a/so-cnf-adapter-application/src/main/resources/application.yaml b/so-cnf-adapter-application/src/main/resources/application.yaml
index 50e667a..c9b786d 100644 (file)
--- a/so-cnf-adapter-application/src/main/resources/application.yaml
+++ b/so-cnf-adapter-application/src/main/resources/application.yaml
@@ -43,9 +43,7 @@ server:
     max-threads: 50
 
 multicloud:
-  protocol: "http"
-  host: "multicloud-k8s"
-  port: 9015
+  endpoint: http://multicloud-k8s.onap:9015
 
 #mso:
  # key: 07a7159d3bf51a0e53be7a8f89699be7