Switch configuration provider to CBS Client - DCAE SDK

Issue-ID: DCAEGEN2-2964
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Iaaf170d209b77b9709cc202c131f9d3bdf1033ed

4 files changed, 28 insertions, 6 deletions

diff --git a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
index 19edc25..090d9fd 100644
--- a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
+++ b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
@@ -99,8 +99,9 @@ services:
     depends_on:
       - datarouter-prov
     environment:
-       CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP
        CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
+       CONFIG_BINDING_SERVICE: $CBS_IP
+       CONSUL_HOST: $CBS_IP
        HOSTNAME: pmmapper
     networks:
       pmmapper-network:
diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml
index ad671d2..91f7b26 100644
--- a/csit/plans/pmmapper/docker-compose.yml
+++ b/csit/plans/pmmapper/docker-compose.yml
@@ -101,8 +101,9 @@ services:
     depends_on:
       - datarouter-prov
     environment:
-       CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP
        CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
+       CONFIG_BINDING_SERVICE: $CBS_IP
+       CONSUL_HOST: $CBS_IP
        HOSTNAME: pmmapper
     networks:
       pmmapper-network:
diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.py b/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.py
index 3e3ae58..036a8a1 100644
--- a/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.py
+++ b/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.py
@@ -1,3 +1,22 @@
+# ============LICENSE_START=======================================================
+# org.onap.dcae
+# ================================================================================
+# Copyright (c) 2021-2022 Nokia. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+#
+
 import docker
 from EnvsReader import EnvsReader
 from docker.types import Mount
@@ -7,8 +26,9 @@ class DockerContainerManager:
     def run_pmmapper_container(self, client_image, container_name, path_to_env, dr_node_ip, mr_ip):
         client = docker.from_env()
         environment = EnvsReader().read_env_list_from_file(path_to_env)
-        environment.append("CONFIG_BINDING_SERVICE_SERVICE_HOST=172.18.0.5")
         environment.append("CONFIG_BINDING_SERVICE_SERVICE_PORT=10000")
+        environment.append("CONFIG_BINDING_SERVICE=172.18.0.5")
+        environment.append("CONSUL_HOST=172.18.0.5")
         environment.append("HOSTNAME=pmmapper")
         client.containers.run(
             image=client_image,
diff --git a/csit/tests/pmmapper/pmmapper.robot b/csit/tests/pmmapper/pmmapper.robot
index f23d33c..72801d0 100644
--- a/csit/tests/pmmapper/pmmapper.robot
+++ b/csit/tests/pmmapper/pmmapper.robot
@@ -42,7 +42,7 @@ ${CLI_MR_LOG}                            cat /tmp/mr.log
 Verify PM Mapper Receive Configuraton From Config Binding Service
     [Tags]                          PM_MAPPER_01
     [Documentation]                 Verify 3gpp pm mapper successfully receive config data from CBS
-    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           Received pm-mapper configuration from ConfigBinding Service
+    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           PM-mapper configuration processed successful
 
 Verify Health Check returns 200 when a REST GET request to healthcheck url
     [Tags]                          PM_MAPPER_02
@@ -154,8 +154,8 @@ Verify 3GPP PM Mapper maps Type-A file based on counter filtering with regexp
 Verify that password receive from CBS are successfully encrypted
     [Tags]                          PM_MAPPER_14
     [Documentation]                 Verify that password receive from CBS are successfully encrypted.
-    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           "aaf_password": *****
-    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           "password": *****
+    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           aafPassword= *****
+    CheckLog                        ${CLI_EXEC_CLI_CONFIG}           password= *****
 
 Verify that PM Mapper correctly maps an NR Type-PM file based on counter filtering and publish 3gpp perf VES events to message router.
     [Tags]                          PM_MAPPER_15