Remove NCMP tag from properties
We have decided to remove the NCMP tag from properties
and will add it later as part of our release process for
KOHN.
Issue-ID: CPS-875
Change-Id: I7282c3c11879f2252c8a1b193df17f3f4bb1cf14
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 00424a5..7ad22e9 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -130,13 +130,14 @@
springframework: INFO
onap:
cps: INFO
-ncmp:
- dmi:
- auth:
- username: ${DMI_USERNAME}
- password: ${DMI_PASSWORD}
- api:
- base-path: dmi
- timers:
- advised-modules-sync:
- sleep-time-ms: 30000
\ No newline at end of file
+
+dmi:
+ auth:
+ username: ${DMI_USERNAME}
+ password: ${DMI_PASSWORD}
+ api:
+ base-path: dmi
+
+timers:
+ advised-modules-sync:
+ sleep-time-ms: 30000
\ No newline at end of file
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 997e7d5..af33651 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
@@ -44,11 +44,11 @@
@Getter
@Component
public static class DmiProperties {
- @Value("${ncmp.dmi.auth.username}")
+ @Value("${dmi.auth.username}")
private String authUsername;
- @Value("${ncmp.dmi.auth.password}")
+ @Value("${dmi.auth.password}")
private String authPassword;
- @Value("${ncmp.dmi.api.base-path}")
+ @Value("${dmi.api.base-path}")
private String dmiBasePath;
}
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/sync/ModuleSyncWatchdog.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/sync/ModuleSyncWatchdog.java
index 368262b..9329b2f 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/sync/ModuleSyncWatchdog.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/sync/ModuleSyncWatchdog.java
@@ -39,7 +39,7 @@
/**
* Execute Cm Handle poll which changes the cm handle state from 'ADVISED' to 'READY'.
*/
- @Scheduled(fixedDelayString = "${ncmp.timers.advised-modules-sync.sleep-time-ms}")
+ @Scheduled(fixedDelayString = "${timers.advised-modules-sync.sleep-time-ms}")
public void executeAdvisedCmHandlePoll() {
YangModelCmHandle advisedCmHandle = syncUtils.getAnAdvisedCmHandle();
while (advisedCmHandle != null) {
diff --git a/cps-ncmp-service/src/test/resources/application.yml b/cps-ncmp-service/src/test/resources/application.yml
index c259bf0..c23926e 100644
--- a/cps-ncmp-service/src/test/resources/application.yml
+++ b/cps-ncmp-service/src/test/resources/application.yml
@@ -16,11 +16,10 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-ncmp:
- dmi:
- auth:
- username: some-user
- password: some-password
- api:
- base-path: dmi
+dmi:
+ auth:
+ username: some-user
+ password: some-password
+ api:
+ base-path: dmi