aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2021-05-28 15:22:00 +0000
committerGerrit Code Review <gerrit@onap.org>2021-05-28 15:22:00 +0000
commit6577ed6cc6138a3bce4dabe4219522029d175b41 (patch)
tree635d68161d8c0285f408221b4928f1470e5912d5
parentc6df8a0bbd0ed66e97001203d0d6dff7008289e2 (diff)
parentfc0c7c85fc3d45055a274dd24fb134a476725678 (diff)
Merge "[TEST] Use nf-simulator/vesclient"
-rw-r--r--src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py4
-rw-r--r--[-rwxr-xr-x]src/onaptests/templates/artifacts/pnf-simulator.tar.gzbin1233 -> 1225 bytes
2 files changed, 2 insertions, 2 deletions
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 f936839..4b09328 100644
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -91,7 +91,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
if not self.is_pnf_pod_running():
EnvironmentPreparationException("PNF simulator is not running")
time.sleep(settings.PNF_WAIT_TIME) # Let's still wait for PNF simulator to make sure it's initialized
- ves_ip, ves_port = self.get_ves_ip_and_port()
+ ves_ip, _ = self.get_ves_ip_and_port() # Use only 8443
registration_number: int = 0
registered_successfully: bool = False
while registration_number < settings.PNF_REGISTRATION_NUMBER_OF_TRIES and not registered_successfully:
@@ -102,7 +102,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
"simulatorParams": {
"repeatCount": 9999,
"repeatInterval": 30,
- "vesServerUrl": f"https://{ves_ip}:{ves_port}/eventListener/v7"
+ "vesServerUrl": f"https://sample1:sample1@{ves_ip}:8443/eventListener/v7"
},
"templateName": "registration.json",
"patch": {
diff --git a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
index 58cde89..a7e6311 100755..100644
--- a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
+++ b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
Binary files differ