Merge "Add ncmp tag to application yaml"

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 263ae6b..138f4e1 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -130,10 +130,10 @@ logging:
             springframework: INFO\r
             onap:\r
                 cps: INFO\r
-\r
-dmi:\r
-    auth:\r
-        username: ${DMI_USERNAME}\r
-        password: ${DMI_PASSWORD}\r
-    api:\r
-        base-path: dmi\r
+ncmp:\r
+    dmi:\r
+        auth:\r
+            username: ${DMI_USERNAME}\r
+            password: ${DMI_PASSWORD}\r
+        api:\r
+            base-path: dmi\r

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
index 60b44c2..3aa17b7 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/config/NcmpConfiguration.java
@@ -38,11 +38,11 @@ public class NcmpConfiguration {
     @Getter
     @Component
     public static class DmiProperties {
-        @Value("${dmi.auth.username}")
+        @Value("${ncmp.dmi.auth.username}")
         private String authUsername;
-        @Value("${dmi.auth.password}")
+        @Value("${ncmp.dmi.auth.password}")
         private String authPassword;
-        @Value("${dmi.api.base-path}")
+        @Value("${ncmp.dmi.api.base-path}")
         private String dmiBasePath;
     }
 

diff --git a/cps-ncmp-service/src/test/resources/application.yml b/cps-ncmp-service/src/test/resources/application.yml
index c23926e..c259bf0 100644 (file)
--- a/cps-ncmp-service/src/test/resources/application.yml
+++ b/cps-ncmp-service/src/test/resources/application.yml
@@ -16,10 +16,11 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 
-dmi:
-    auth:
-        username: some-user
-        password: some-password
-    api:
-        base-path: dmi
+ncmp:
+    dmi:
+        auth:
+            username: some-user
+            password: some-password
+        api:
+            base-path: dmi