From: Toine Siebelink <toine.siebelink@est.tech>
Date: Tue, 10 May 2022 14:29:54 +0000 (+0000)
Subject: Merge "Add ncmp tag to application yaml"
X-Git-Tag: 3.1.0~128
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=cps.git;a=commitdiff_plain;h=7f47110ca5c7f3f8f8b42a5ad8178d1dbe300923;hp=f18001f3c8862b4887f29b060a2434aca1422dea

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 263ae6b3d..138f4e188 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -130,10 +130,10 @@ logging:
             springframework: INFO
             onap:
                 cps: INFO
-
-dmi:
-    auth:
-        username: ${DMI_USERNAME}
-        password: ${DMI_PASSWORD}
-    api:
-        base-path: dmi
+ncmp:
+    dmi:
+        auth:
+            username: ${DMI_USERNAME}
+            password: ${DMI_PASSWORD}
+        api:
+            base-path: dmi
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 60b44c246..3aa17b70c 100644
--- 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 c23926e4e..c259bf005 100644
--- 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