Allow HV-VES tests to be run locally

Change-Id: Id81e209c03486354a60b26c4fe426071080198f0
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1369

12 files changed, 163 insertions, 95 deletions

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env
deleted file mode 100644
index e0286167..00000000
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/.env
+++ /dev/null
@@ -1,33 +0,0 @@
-# ============LICENSE_START=======================================================
-# dcaegen2-collectors-veshv
-# ================================================================================
-# Copyright (C) 2018-2019 NOKIA
-# ================================================================================
-# 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=========================================================
-
-HV_VES_COLLECTOR_NAMESPACE=onap
-HV_VES_GROUP_ID=org.onap.dcaegen2.collectors.hv-ves
-HV_VES_IMAGE=hv-collector-main
-DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator
-
-# IF CHANGING BELOW VALUE, REMEMBER TO UPDATE ALSO XNF-SIMULATOR VERSION
-# IN XNF_SIMULATOR_LIBRARY PYTHON FILE.
-HV_VES_VERSION=1.1-SNAPSHOT
-
-HV_VES_HEALTHCHECK_CMD=curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061
-
-JAVA_OPTS=-Dio.netty.leakDetection.level=paranoid
-CONSUL_HOST=consul-server
-CONFIG_BINDING_SERVICE=config-binding-service
-HV_VES_HOSTNAME=dcae-hv-ves-collector
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index bc7105ec..1d34e9f8 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -19,7 +19,7 @@ version: "3"
 
 
 networks:
-  ves-hv-default:
+  hv-ves-default:
     external:
       name: $CONTAINERS_NETWORK
 
@@ -34,7 +34,7 @@ services:
     ports:
       - "2181:2181"
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   kafka:
     image: wurstmeister/kafka
@@ -50,7 +50,7 @@ services:
     depends_on:
       - zookeeper
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   #
   # Consul / CBS
@@ -63,7 +63,7 @@ services:
     volumes:
       - ./consul/:/consul/config
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   config-binding-service:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
@@ -74,13 +74,13 @@ services:
     depends_on:
       - consul-server
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   #
   # DCAE HV VES Collector
   #
 
-  ves-hv-collector:
+  hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
       - "6060:6060"
@@ -102,9 +102,9 @@ services:
       - config-binding-service
       - kafka
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
-  unencrypted-ves-hv-collector:
+  unencrypted-hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
       - "7060:6060"
@@ -126,7 +126,7 @@ services:
       - config-binding-service
       - kafka
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
   dcae-app-simulator:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION}
@@ -141,5 +141,5 @@ services:
     depends_on:
       - kafka
     networks:
-      - ves-hv-default
+      - hv-ves-default
 
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
new file mode 100755
index 00000000..bbb54932
--- /dev/null
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# ============LICENSE_START=======================================================
+# csit-dcaegen2-collectors-hv-ves
+# ================================================================================
+# Copyright (C) 2019 NOKIA
+# ================================================================================
+# 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=========================================================
+
+# using WORKSPACE variable defined in run-csit.sh
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
+
+export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
+export CONSUL_HOST="consul-server"
+export CONFIG_BINDING_SERVICE="config-binding-service"
+
+export DOCKER_REGISTRY="nexus3.onap.org:10001"
+export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
+export CONTAINERS_NETWORK="hv-ves-default"
+export HV_VES_SERVICE_NAME="hv-ves-collector"
+export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
+
+export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
+export HV_VES_HOSTNAME="dcae-hv-ves-collector"
+export HV_VES_COLLECTOR_NAMESPACE="onap"
+export HV_VES_HEALTHCHECK_CMD=$(curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061)
+export HV_VES_VERSION="1.1-SNAPSHOT"
+export HV_VES_IMAGE="hv-collector-main"
+export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
+export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator"
+
+
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
new file mode 100755
index 00000000..afe8a542
--- /dev/null
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# ============LICENSE_START=======================================================
+# csit-dcaegen2-collectors-hv-ves
+# ================================================================================
+# Copyright (C) 2019 NOKIA
+# ================================================================================
+# 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=========================================================
+
+export WORKSPACE=$(git rev-parse --show-toplevel)
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
+
+export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
+export CONSUL_HOST="consul-server"
+export CONFIG_BINDING_SERVICE="config-binding-service"
+
+export DOCKER_REGISTRY="docker.io"
+export DOCKER_REGISTRY_PREFIX=""
+export CONTAINERS_NETWORK="hv-ves-default"
+export HV_VES_SERVICE_NAME="hv-ves-collector"
+export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
+
+export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
+export HV_VES_HOSTNAME="dcae-hv-ves-collector"
+export HV_VES_COLLECTOR_NAMESPACE="onap"
+export HV_VES_HEALTHCHECK_CMD=$(curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061)
+export HV_VES_VERSION="latest"
+export HV_VES_IMAGE="hv-collector-main"
+export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
+export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator"
+
+
+
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
index 34baae8e..06eaf543 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
@@ -19,14 +19,13 @@
 
 set -euo pipefail
 
-if [[ $# -eq 1 ]] && [[ $1 == "local-test-run" ]]; then
+RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false}
+
+if ${RUN_CSIT_LOCAL} ; then
   echo "Building locally - assuming all dependencies are installed"
-  export DOCKER_REGISTRY=""
-  export DOCKER_REGISTRY_PREFIX=""
-  export WORKSPACE=$(git rev-parse --show-toplevel)
+  source env_local.sh
 else
   echo "Default run - install all dependencies"
-
   pip uninstall -y docker-py
   pip install docker
 
@@ -34,15 +33,12 @@ else
   COMPOSE_LOCATION='/usr/local/bin/docker-compose'
   sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION}
   sudo chmod +x ${COMPOSE_LOCATION}
-
-  export DOCKER_REGISTRY="nexus3.onap.org:10001"
-  export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
+  source env.sh
 fi
 
 echo "Removing not used docker networks"
 docker network prune -f
 
-export CONTAINERS_NETWORK=ves-hv-default
 echo "Creating network for containers: ${CONTAINERS_NETWORK}"
 docker network create ${CONTAINERS_NETWORK}
 
@@ -53,5 +49,3 @@ cd ../..
 docker-compose up -d
 
 mkdir -p ${WORKSPACE}/archives/containers_logs
-
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
index ec392154..787f811e 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
@@ -17,17 +17,35 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
+RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false}
+
 cd collector/ssl
 ./gen-certs.sh clean
 cd ../..
 
+if ${RUN_CSIT_LOCAL} ; then
+  echo "Tearing down local setup"
+  source env_local.sh
+else
+  echo "Tearing down"
+  source env.sh
+fi
+
+set +e
+
 COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log
 docker-compose logs > ${COMPOSE_LOGS_FILE}
 docker-compose down
 docker-compose rm -f
 
+echo "Stopping leftover containers"
+LEFTOVER_CONTAINERS=$(docker ps -aqf network=${CONTAINERS_NETWORK} | awk '{print $1}')
+docker stop ${LEFTOVER_CONTAINERS}
+docker rm ${LEFTOVER_CONTAINERS}
 docker network rm ${CONTAINERS_NETWORK}
 
+set -e
+
 if grep "LEAK:" ${COMPOSE_LOGS_FILE}; then
     echo "WARNING: Memory leak detected in docker-compose logs."
 fi
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
index 54d3e1c8..1ac91504 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
@@ -33,8 +33,8 @@ HV-VES Collector Suites Setup
 
 Configure collector
     ${CONSUL_API_ACCESS}=   Get Consul Api Access Url   ${HTTP_METHOD_URL}   ${CONSUL_CONTAINER_HOST}   ${CONSUL_CONTAINER_PORT}
-    ${CONSUL_API_URL}=  Catenate   SEPARATOR=   ${CONSUL_API_ACCESS}   ${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}
-    Publish HV VES Configuration In Consul    ${CONSUL_API_URL}   ${VES_HV_CONFIGURATION_JSON_FILEPATH}
+    ${CONSUL_API_URL}=  Catenate   SEPARATOR=   ${CONSUL_API_ACCESS}   ${CONSUL_HV_VES_CONFIGURATION_KEY_PATH}
+    Publish HV VES Configuration In Consul    ${CONSUL_API_URL}   ${HV_VES_CONFIGURATION_JSON_FILEPATH}
 
 Configure Dcae App
     ${DCAE_APP_API_ACCESS}=   Get Dcae App Api Access Url   ${HTTP_METHOD_URL}   ${DCAE_APP_CONTAINER_HOST}   ${DCAE_APP_CONTAINER_PORT}
@@ -58,7 +58,7 @@ ${HTTP_METHOD_URL}                             http://
 
 ${CONSUL_CONTAINER_HOST}                       consul-server
 ${CONSUL_CONTAINER_PORT}                       8500
-${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
+${CONSUL_HV_VES_CONFIGURATION_KEY_PATH}        /v1/kv/dcae-hv-ves-collector
 
 ${DCAE_APP_CONTAINER_HOST}                     dcae-app-simulator
 ${DCAE_APP_CONTAINER_PORT}                     6063
@@ -70,5 +70,5 @@ ${DCAE_APP_API_MESSAGES_VALIDATION_PATH}       ${DCAE_APP_API_MESSAGES_PATH}/val
 
 ${ROUTED_MESSAGES_TOPIC}                       TEST_HV_VES_PERF3GPP
 
-${VES_HV_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
-${VES_HV_CONFIGURATION_JSON_FILEPATH}          ${VES_HV_RESOURCES}/ves-hv-configuration.json
+${HV_VES_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
+${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/ves-hv-configuration.json
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot b/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot
index d5fc1e99..4d13a6bf 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot
@@ -72,9 +72,9 @@ Unencrypted connection on both ends
 
 
 *** Variables ***
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${HV_VES_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 
-${XNF_VALID_MESSAGES_REQUEST}                  ${VES_HV_SCENARIOS}/authorization/xnf-valid-messages-request.json
+${XNF_VALID_MESSAGES_REQUEST}                  ${HV_VES_SCENARIOS}/authorization/xnf-valid-messages-request.json
 
 ${AMOUNT_0}                                    0
 ${AMOUNT_5000}                                 5000
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py
index 3d811e49..dd41c6a3 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py
@@ -33,8 +33,8 @@ class DcaeAppSimulatorLibrary:
         resp = HttpRequests.session_without_env().get(app_url, timeout=10)
         HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
 
-        assert resp.content == expected_messages_amount, \
-            "Messages consumed by simulator: " + resp.content + " expecting: " + expected_messages_amount
+        assert int(resp.content) == int(expected_messages_amount), \
+            "Messages consumed by simulator: " + str(resp.content) + " expecting: " + str(expected_messages_amount)
 
     def assert_DCAE_app_consumed_less_equal_than(self, app_url, messages_threshold):
         logger.info("GET at: " + app_url)
@@ -45,8 +45,8 @@ class DcaeAppSimulatorLibrary:
                      " expecting more than 0 and less/equal than " + messages_threshold)
 
         assert 0 < int(resp.content) <= int(messages_threshold), \
-            "Messages consumed by simulator: " + resp.content + \
-            " expecting more than 0 and less/equal than " + messages_threshold
+            "Messages consumed by simulator: " + str(resp.content) + \
+            " expecting more than 0 and less/equal than " + str(messages_threshold)
 
     def reset_DCAE_app_simulator(self, app_url):
         logger.info("DELETE at: " + app_url)
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
index 3f69f6ab..789c0b69 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
@@ -22,15 +22,21 @@ import docker
 from robot.api import logger
 from time import sleep
 
+HV_VES_VERSION = os.getenv("HV_VES_VERSION")
+HV_VES_COLLECTOR_NETWORK = os.getenv("CONTAINERS_NETWORK")
+HV_VES_COLLECTOR_NAMESPACE = os.getenv("HV_VES_COLLECTOR_NAMESPACE")
+HV_VES_GROUP_ID = os.getenv("HV_VES_GROUP_ID")
+HV_VES_SERVICE_NAME = os.getenv("HV_VES_SERVICE_NAME")
+UNENCRYPTED_HV_VES_SERVICE_NAME = os.getenv("UNENCRYPTED_HV_VES_SERVICE_NAME")
+
 XNF_SIMULATOR_NAME = "xNF Simulator"
-HV_VES_COLLECTOR_NAMESPACE="onap"
-HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
+XNF_SIMULATOR_CONTAINER_PREFIX = os.getenv("XNF_SIMULATOR_IMAGE")
 SIMULATOR_IMAGE_NAME = HV_VES_COLLECTOR_NAMESPACE + "/" + HV_VES_GROUP_ID + ".hv-collector-xnf-simulator"
-HV_VES_VERSION="1.1-SNAPSHOT"
+
 SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":" + HV_VES_VERSION
 WORKSPACE_ENV = os.getenv("WORKSPACE")
-certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/"
-collector_certs_lookup_dir = "/etc/ves-hv/"
+CERTIFICATES_DIR_PATH = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/"
+COLLECTOR_CERTS_LOOKUP_DIR = "/etc/ves-hv/"
 ONE_SECOND_IN_NANOS = 10 ** 9
 
 
@@ -88,13 +94,13 @@ class XnfSimulatorLibrary:
                                            command=xNF_startup_command,
                                            healthcheck=xNF_healthcheck_command,
                                            detach=True,
-                                           network="ves-hv-default",
+                                           network=HV_VES_COLLECTOR_NETWORK,
                                            ports={port + "/tcp": port},
                                            volumes=self.container_volumes(),
-                                           name=xnf.container_name_prefix + port)
+                                           name=XNF_SIMULATOR_CONTAINER_PREFIX + port)
 
     def container_volumes(self):
-        return {certificates_dir_path: {"bind": collector_certs_lookup_dir, "mode": 'rw'}}
+        return {CERTIFICATES_DIR_PATH: {"bind": COLLECTOR_CERTS_LOOKUP_DIR, "mode": 'rw'}}
 
     def assert_containers_startup_was_successful(self, dockerClient):
         checks_amount = 6
@@ -119,7 +125,7 @@ class XnfSimulatorLibrary:
             log_filename = WORKSPACE_ENV + "/archives/containers_logs/" + \
                            suite_name.split(".")[-1] + "_" + container.name + ".log"
             file = open(log_filename, "w+")
-            file.write(container.logs())
+            file.write(str(container.logs()))
             file.close()
             container.stop()
             container.remove()
@@ -141,7 +147,6 @@ class XnfSimulatorLibrary:
 
 
 class XnfSimulator:
-    container_name_prefix = "ves-hv-collector-xnf-simulator"
 
     def __init__(self,
                  port,
@@ -151,13 +156,13 @@ class XnfSimulator:
         self.port = port
         self.healthcheck_server_port = "6063"
         cert_name_prefix = "" if should_use_valid_certs else "untrusted"
-        certificates_path_with_file_prefix = collector_certs_lookup_dir + cert_name_prefix
+        certificates_path_with_file_prefix = COLLECTOR_CERTS_LOOKUP_DIR + cert_name_prefix
         self.key_store_path = certificates_path_with_file_prefix + "client.p12"
         self.trust_store_path = certificates_path_with_file_prefix + "trust.p12"
         self.sec_store_passwd = "onaponap"
         self.disable_ssl = should_disable_ssl
-        self.hv_collector_host = "unencrypted-ves-hv-collector" \
-            if should_connect_to_unencrypted_hv_ves else "ves-hv-collector"
+        self.hv_collector_host = UNENCRYPTED_HV_VES_SERVICE_NAME \
+            if should_connect_to_unencrypted_hv_ves else HV_VES_SERVICE_NAME
 
     def get_startup_command(self):
         startup_command = ["--listen-port", self.port,
@@ -167,8 +172,7 @@ class XnfSimulator:
                            "--key-store", self.key_store_path,
                            "--trust-store", self.trust_store_path,
                            "--key-store-password", self.sec_store_passwd,
-                           "--trust-store-password", self.sec_store_passwd
-                           ]
+                           "--trust-store-password", self.sec_store_passwd]
         if self.disable_ssl:
             startup_command.append("--ssl-disable")
         return startup_command
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
index 15c8ee8b..2fab3295 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
@@ -96,18 +96,18 @@ ${HTTP_METHOD_URL}                             http://
 
 ${XNF_SIM_API_PATH}                            /simulator/async
 
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
-${XNF_FIXED_PAYLOAD_REQUEST}                   ${VES_HV_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
-${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
-${XNF_INVALID_WIRE_FRAME_REQUEST}              ${VES_HV_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
-${XNF_INVALID_GPB_DATA_REQUEST}                ${VES_HV_SCENARIOS}/invalid-gpb-data/xnf-invalid-gpb-data-request.json
-${XNF_UNSUPPORTED_DOMAIN_REQUEST}              ${VES_HV_SCENARIOS}/unsupported-domain/xnf-unsupported-domain-request.json
-
-${DCAE_FIXED_PAYLOAD_REQUEST}                  ${VES_HV_SCENARIOS}/fixed-payload/dcae-fixed-payload-request.json
-${DCAE_TOO_BIG_PAYLOAD_REQUEST}                ${VES_HV_SCENARIOS}/too-big-payload/dcae-too-big-payload-request.json
-${DCAE_INVALID_WIRE_FRAME_REQUEST}             ${VES_HV_SCENARIOS}/invalid-wire-frame/dcae-invalid-wire-frame-request.json
-${DCAE_INVALID_GPB_DATA_REQUEST}               ${VES_HV_SCENARIOS}/invalid-gpb-data/dcae-invalid-gpb-data-request.json
-${DCAE_UNSUPPORTED_DOMAIN_REQUEST}             ${VES_HV_SCENARIOS}/unsupported-domain/dcae-unsupported-domain-request.json
+${HV_VES_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${XNF_FIXED_PAYLOAD_REQUEST}                   ${HV_VES_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
+${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${HV_VES_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
+${XNF_INVALID_WIRE_FRAME_REQUEST}              ${HV_VES_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
+${XNF_INVALID_GPB_DATA_REQUEST}                ${HV_VES_SCENARIOS}/invalid-gpb-data/xnf-invalid-gpb-data-request.json
+${XNF_UNSUPPORTED_DOMAIN_REQUEST}              ${HV_VES_SCENARIOS}/unsupported-domain/xnf-unsupported-domain-request.json
+
+${DCAE_FIXED_PAYLOAD_REQUEST}                  ${HV_VES_SCENARIOS}/fixed-payload/dcae-fixed-payload-request.json
+${DCAE_TOO_BIG_PAYLOAD_REQUEST}                ${HV_VES_SCENARIOS}/too-big-payload/dcae-too-big-payload-request.json
+${DCAE_INVALID_WIRE_FRAME_REQUEST}             ${HV_VES_SCENARIOS}/invalid-wire-frame/dcae-invalid-wire-frame-request.json
+${DCAE_INVALID_GPB_DATA_REQUEST}               ${HV_VES_SCENARIOS}/invalid-gpb-data/dcae-invalid-gpb-data-request.json
+${DCAE_UNSUPPORTED_DOMAIN_REQUEST}             ${HV_VES_SCENARIOS}/unsupported-domain/dcae-unsupported-domain-request.json
 
 ${AMOUNT_25000}                                25000
 ${AMOUNT_50000}                                50000
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot b/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot
index 09b62c78..735a2085 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot
@@ -45,9 +45,9 @@ Handle Multiple Connections
 
 
 *** Variables ***
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${HV_VES_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 
-${XNF_SMALLER_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json
-${DCAE_SMALLER_PAYLOAD_REQUEST}                ${VES_HV_SCENARIOS}/multiple-simulators-payload/dcae-smaller-valid-request.json
+${XNF_SMALLER_PAYLOAD_REQUEST}                 ${HV_VES_SCENARIOS}/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json
+${DCAE_SMALLER_PAYLOAD_REQUEST}                ${HV_VES_SCENARIOS}/multiple-simulators-payload/dcae-smaller-valid-request.json
 
 ${AMOUNT_15000}                                15000