From: Niranjana <niranjana.y60@wipro.com>
Date: Tue, 29 Mar 2022 15:40:21 +0000 (+0000)
Subject: [DCAE] Update application config properties for slice/son/kpi ms
X-Git-Tag: 10.0.0~39^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=0e692649a83ddba1029efdd8ba18b8defe7e535d

[DCAE] Update application config properties for slice/son/kpi ms

- Remove AAF credentials in DMAAP configuration from
slice-analysis-ms, son-handler-ms and kpi-ms charts

Issue-ID: DCAEGEN2-3034
Issue-ID: DCAEGEN2-3035
Issue-ID: DCAEGEN2-3033
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I85bee827cda40e5eca101846ab59b317c917a966
---

diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 72c6a4bcce..ad8ca9fb2e 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -123,15 +123,11 @@ applicationConfig:
   cid: kpi-cid
   streams_subscribes:
     performance_management_topic:
-      aafUsername: ${AAF_IDENTITY}
-      aafPassword: ${AAF_PASSWORD}
       type: message-router
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS
   streams_publishes:
     kpi_topic:
-      aafUsername: ${AAF_IDENTITY}
-      aafPassword: ${AAF_PASSWORD}
       type: message-router
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.DCAE_KPI_OUTPUT
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index 9261b8ebe0..869472e2d8 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -147,27 +147,19 @@ applicationConfig:
   streams_publishes:
     CL_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT
   streams_subscribes:
     performance_management_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.PERFORMANCE_MEASUREMENTS
     intelligent_slicing_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.ML_RESPONSE_TOPIC
     dcae_cl_response_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/DCAE_CL_RSP
 
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 88ceac0e8d..5e487e27a9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -186,33 +186,23 @@ applicationConfig:
   streams_publishes:
     CL_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT
   streams_subscribes:
     performance_management_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT
     fault_management_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/unauthenticated.SEC_FAULT_OUTPUT
     nbr_list_change_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
     dcae_cl_response_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
         topic_url: http://message-router:3904/events/DCAE_CL_RSP
   service_calls: