[TEST] Make the simulator's URL and Port configurable

- Add URLs and Ports configurable

Issue-ID: TEST-404

Change-Id: Iee2ee962000709bd54d453371fb8dfc915917f7f
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py
index 140cd27..fd995cd 100644 (file)
--- a/src/onaptests/configuration/cds_resource_resolution_settings.py
+++ b/src/onaptests/configuration/cds_resource_resolution_settings.py
@@ -26,6 +26,8 @@ MSB_K8S_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}"
 K8S_VERSION = "1.0"
 K8S_CONFIG = get_resource_location("templates/artifacts/config")
 K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests"
+CDS_MOCKSERVER_URL = "portal.api.simpledemo.onap.org"
+CDS_MOCKSERVER_PORT = 30726
 CDS_MOCKSERVER_EXPECTATIONS = [
     {
         "method": "GET",

diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index 7ce67a0..c7f249d 100644 (file)
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -63,6 +63,8 @@ SERVICE_INSTANCE_NAME = f"TestPNFMacroInstantiation_{str(uuid4())}"
 DCAE_VES_COLLECTOR_POD_NAME = "dcae-ves-collector"
 PNF_WAIT_TIME = 60.0
 PNF_REGISTRATION_NUMBER_OF_TRIES = 20
+PNF_SIMULATOR_URL = "portal.api.simpledemo.onap.org"
+PNF_SIMULATOR_PORT = 30999
 
 # Disable YAML SDC model definition which means all SDC config reside in SERVICE_YAML_TEMPLATE
 MODEL_YAML_TEMPLATE = None

diff --git a/src/onaptests/steps/simulator/cds_mockserver.py b/src/onaptests/steps/simulator/cds_mockserver.py
index 8773248..927ed36 100644 (file)
--- a/src/onaptests/steps/simulator/cds_mockserver.py
+++ b/src/onaptests/steps/simulator/cds_mockserver.py
@@ -38,14 +38,18 @@ class CdsMockserverCnfConfigureStep(BaseStep):
         """Create mockserver expectations.
 
         Use settings values:
+         - CDS_MOCKSERVER_URL.
+         - CDS_MOCKSERVER_PORT.
          - CDS_MOCKSERVER_EXPECTATIONS.
         """
         super().execute()
         time.sleep(60)  # Wait for mockserver
+        sim_url = settings.CDS_MOCKSERVER_URL
+        sim_port = settings.CDS_MOCKSERVER_PORT
         for expectation in settings.CDS_MOCKSERVER_EXPECTATIONS:
             try:
                 response = requests.put(
-                    "http://portal.api.simpledemo.onap.org:30726/mockserver/expectation",
+                    f"http://{sim_url}:{sim_port}/mockserver/expectation",
                     json={
                         "httpRequest": {
                             "method": expectation["method"],

diff --git a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
index 4ef92ef..dee96b8 100644 (file)
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -107,13 +107,15 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
         # Let's still wait for PNF simulator to make sure it's initialized
         time.sleep(settings.PNF_WAIT_TIME)
         ves_proto, ves_ip, ves_port = self.get_ves_protocol_ip_and_port()
+        sim_url = settings.PNF_SIMULATOR_URL
+        sim_port = settings.PNF_SIMULATOR_PORT
         registration_number: int = 0
         registered_successfully: bool = False
         while (registration_number < settings.PNF_REGISTRATION_NUMBER_OF_TRIES and
                not registered_successfully):
             try:
                 response = requests.post(
-                    "http://portal.api.simpledemo.onap.org:30999/simulator/start",
+                    f"http://{sim_url}:{sim_port}/simulator/start",
                     json={
                         "simulatorParams": {
                             "repeatCount": 9999,