diff options
| author |   DylanB95EST <dylan.byrne@est.tech> | 2022-05-16 10:45:56 +0100 |
|---|---|---|
| committer | DylanB95EST <dylan.byrne@est.tech> | 2022-05-16 10:46:00 +0100 |
| commit | 324eb16687756f1850ffa484f652e117878cf33f (patch) | |
| tree | c8ec86141b6d19d629f967a11562c3e99e7dbb19 /cps-ncmp-service/src | |
| parent | 806d31aed57c798cba0ecc33d92e5b43fa1d957b (diff) | |
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>
Diffstat (limited to 'cps-ncmp-service/src')
3 files changed, 10 insertions, 11 deletions
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 997e7d5324..af33651ebe 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 @@ public class NcmpConfiguration { @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 368262b972..9329b2fb7e 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 @@ public class ModuleSyncWatchdog { /** * 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 c259bf0057..c23926e4eb 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 |