Merge "[DCAE] Update application config properties in slice-analysis-ms"

diff --combined kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index cf9e84b,14bbde0..849738e
--- 1/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
--- 2/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@@ -1,6 -1,6 +1,6 @@@
  # ============= LICENSE_START ================================================
  # ============================================================================
- # Copyright (C) 2021 Wipro Limited.
+ # Copyright (C) 2021-2022 Wipro Limited.
  # ============================================================================
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -57,7 -57,7 +57,7 @@@ consulLoaderImage: onap/org.onap.dcaege
  # Application Configuration Defaults.
  #################################################################
  # Application Image
- image: onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.0.6
+ image: onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.0.7
  
  # Log directory where logging sidecar should look for log files
  # if path is set to null sidecar won't be deployed in spite of
@@@ -78,6 -78,7 +78,6 @@@ tlsServer: tru
  # Dependencies
  readinessCheck:
    wait_for:
 -    - dcae-config-binding-service
      - aaf-cm
      - &postgresName dcae-sliceanalysisms-postgres
  
@@@ -120,8 -121,6 +120,6 @@@ credentials
  
  # Initial Application Configuration
  applicationConfig:
-   aafUsername: ${AAF_IDENTITY}
-   aafPassword: ${AAF_PASSWORD}
    postgres.host: dcae-sliceanalysisms-pg-primary
    postgres.port: 5432
    postgres.username: ${PG_USERNAME}
@@@ -143,32 -142,35 +141,35 @@@
    sliceanalysisms.samples: 3
    sliceanalysisms.minPercentageChange: 5
    sliceanalysisms.initialDelaySeconds: 120000
+   sliceanalysisms.rannfnssiDetailsTemplateId: get-rannfnssiid-details
+   sliceanalysisms.desUrl: http://dl-des:1681/datalake/v1/exposure/pm_data
+   sliceanalysisms.pmDataDurationInWeeks: 4
    streams_publishes:
      CL_topic:
        type: message-router
        aaf_username: ${AAF_IDENTITY}
        aaf_password: ${AAF_PASSWORD}
        dmaap_info:
-         topic_url: https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.DCAE_CL_OUTPUT
+         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: https://message-router.onap.svc.cluster.local:3905/events/org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS
+         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: https://message-router.onap.svc.cluster.local:3905/events/unauthenticated.ML_RESPONSE_TOPIC
+         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: https://message-router.onap.svc.cluster.local:3905/events/DCAE_CL_RSP
+         topic_url: http://message-router:3904/events/DCAE_CL_RSP
  
  applicationEnv:
    STANDALONE: 'false'