Update HV-VES testsuites

[integration/csit.git] / tests / dcaegen2-collectors-hv-ves / testcases / libraries / XnfSimulatorLibrary.py

diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
index 46b72b0..6c95743 100644 (file)
--- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
@@ -11,7 +11,7 @@ SIMULATOR_IMAGE_NAME = HV_VES_COLLECTOR_NAMESPACE + "/" + HV_VES_GROUP_ID + ".hv
 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/ssl/"
+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
 
@@ -131,6 +131,7 @@ class XnfSimulator:
                  should_disable_ssl,
                  should_connect_to_unencrypted_hv_ves):
         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
         self.key_store_path = certificates_path_with_file_prefix + "client.p12"
@@ -142,6 +143,7 @@ class XnfSimulator:
 
     def get_startup_command(self):
         startup_command = ["--listen-port", self.port,
+                           "--health-check-api-port", self.healthcheck_server_port,
                            "--ves-host", self.hv_collector_host,
                            "--ves-port", "6061",
                            "--key-store", self.key_store_path,
@@ -160,7 +162,7 @@ class XnfSimulator:
             "retries": 1,
             "test": ["CMD", "curl", "--request", "GET",
                      "--fail", "--silent", "--show-error",
-                     "localhost:" + self.port + "/healthcheck"]
+                     "localhost:" + self.healthcheck_server_port + "/health/ready"]
         }