From e345397b319c759fe8a3cb4d661fe18cecffd604 Mon Sep 17 00:00:00 2001
From: DylanB95EST <dylan.byrne@est.tech>
Date: Mon, 9 May 2022 17:03:52 +0100
Subject: [PATCH] Add ncmp tag to application yaml

Add an NCMP tag to Application.yml to store
NCMP related propeties

Issue-ID: CPS-875
Change-Id: I2bce3d765ae69cc2a4bb52a472eea7cae745fd2c
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
---
 cps-application/src/main/resources/application.yml         | 14 +++++++-------
 .../onap/cps/ncmp/api/impl/config/NcmpConfiguration.java   |  6 +++---
 cps-ncmp-service/src/test/resources/application.yml        | 13 +++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

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
 
-- 
2.16.6