diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2021-08-24 09:26:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-08-24 09:26:20 +0000 |
| commit | 46f58f1f28e1deffa1128c21f4425fea3583060c (patch) | |
| tree | 36aa46c800f6598a9e75f0b6e87a2024bb1eebc3 | |
| parent | 0112178680266620628c4dd92c8d611c6aa0b19e (diff) | |
| parent | e6e5786b73378509900ef5e1b7ea2bfdddbcf8d3 (diff) | |
Merge "Mutlicloud config aligned with global so config"
| -rw-r--r-- | so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/MulticloudConfiguration.java | 10 | ||||
| -rw-r--r-- | so-cnf-adapter-application/src/main/resources/application.yaml | 4 |
2 files changed, 4 insertions, 10 deletions
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 --- 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 --- 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 |