From e17bf96a511b600f9631a7b3068477b0f87d52b9 Mon Sep 17 00:00:00 2001 From: mpriyank Date: Tue, 10 Jun 2025 12:27:12 +0100 Subject: [PATCH] Remove unused cps auth params from DMI - we have removed spring security from CPS repo hence cleaning up the auth related parameters - updating the documentation related to the same Issue-ID: CPS-2841 Change-Id: Ia1deab32ad6b39346a3c9793a1ea5a4c17e3a7f7 Signed-off-by: mpriyank --- csit/plans/dmi/test.properties | 2 -- .../main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java | 4 ---- dmi-service/src/main/resources/application.yml | 3 --- .../org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy | 2 -- dmi-service/src/test/resources/application.yml | 3 --- docker-compose/README.md | 6 ++---- docker-compose/docker-compose.yml | 8 ++------ 7 files changed, 4 insertions(+), 24 deletions(-) diff --git a/csit/plans/dmi/test.properties b/csit/plans/dmi/test.properties index 2929eb68..e56576a5 100644 --- a/csit/plans/dmi/test.properties +++ b/csit/plans/dmi/test.properties @@ -10,8 +10,6 @@ SDNC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U CPS_CORE_HOST=$LOCAL_IP CPS_CORE_PORT=8883 CPS_CORE_MANAGEMENT_PORT=8887 -CPS_CORE_USERNAME=cpsuser -CPS_CORE_PASSWORD=cpsr0cks! DMI_HOST=$LOCAL_IP DMI_PORT=8783 diff --git a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java index dee3c751..daca4ee9 100644 --- a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java +++ b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/config/DmiConfiguration.java @@ -47,10 +47,6 @@ public class DmiConfiguration { private String dmiRegistrationUrl; @Value("${cps-core.dataSyncEnabledUrl}") private String dataSyncEnabledUrl; - @Value("${cps-core.auth.username}") - private String authUsername; - @Value("${cps-core.auth.password}") - private String authPassword; } @Getter diff --git a/dmi-service/src/main/resources/application.yml b/dmi-service/src/main/resources/application.yml index d6399329..7ba9b256 100644 --- a/dmi-service/src/main/resources/application.yml +++ b/dmi-service/src/main/resources/application.yml @@ -109,9 +109,6 @@ cps-core: baseUrl: http://${CPS_CORE_HOST}:${CPS_CORE_PORT} dmiRegistrationUrl : /ncmpInventory/v1/ch dataSyncEnabledUrl: /ncmp/v1/ch/{cmHandleId}/data-sync?dataSyncEnabled=true - auth: - username: ${CPS_CORE_USERNAME} - password: ${CPS_CORE_PASSWORD} sdnc: baseUrl: http://${SDNC_HOST}:${SDNC_PORT} diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy index 9637371a..8f3aa0e8 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/config/DmiConfigurationSpec.groovy @@ -40,8 +40,6 @@ class DmiConfigurationSpec extends Specification { expect: 'CPS properties are set to values in test configuration yaml file' cpsProperties.baseUrl == 'some url for cps' cpsProperties.dmiRegistrationUrl == 'some registration url' - cpsProperties.authUsername == 'some cps core user' - cpsProperties.authPassword == 'some cps core password' cpsProperties.dataSyncEnabledUrl == 'some data sync url/{some-cm-handle}?dataSyncFlag=true' } diff --git a/dmi-service/src/test/resources/application.yml b/dmi-service/src/test/resources/application.yml index 2a2cf96b..2a6269a1 100644 --- a/dmi-service/src/test/resources/application.yml +++ b/dmi-service/src/test/resources/application.yml @@ -37,9 +37,6 @@ cps-core: baseUrl: some url for cps dmiRegistrationUrl: some registration url dataSyncEnabledUrl: some data sync url/{some-cm-handle}?dataSyncFlag=true - auth: - username: some cps core user - password: some cps core password dmi: service: diff --git a/docker-compose/README.md b/docker-compose/README.md index 109cc629..a14aa3d8 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -1,6 +1,6 @@