From 8f5d1543c3147cc06cd59d491904b9712a7e25a8 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Fri, 24 Mar 2023 12:30:38 +0000 Subject: Change on onaptests_bench to run stability tests on sm env Change settings and hosts on launcher script Issue-ID: INT-2214 Signed-off-by: Michal Jagiello Change-Id: If62d43f2e103629e35a313847ae97e5a6b90e13d --- docs/docs_5G_NRM_Configuration.rst | 1 - docs/docs_5G_oof_son.rst | 2 +- ...esting_5G_PNF_Software_Upgrade_With_Schema_Update.rst | 4 ++-- .../src/onaptests_bench/artifacts/settings.py | 15 +++++++++++++++ test/onaptests_bench/src/onaptests_bench/launcher.py | 16 ++++++++-------- tox.ini | 6 ++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/docs/docs_5G_NRM_Configuration.rst b/docs/docs_5G_NRM_Configuration.rst index a57664832..1deeb97e8 100644 --- a/docs/docs_5G_NRM_Configuration.rst +++ b/docs/docs_5G_NRM_Configuration.rst @@ -15,7 +15,6 @@ Network Resource Model (NRM) configuration management allows service providers t Useful Links ============ `5G NRM Configuration in R6 Wiki Page `_ -`3GPP TS 28541 `_ Current Status in Frankfurt ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/docs_5G_oof_son.rst b/docs/docs_5G_oof_son.rst index 8a01a28b3..0ec539d76 100644 --- a/docs/docs_5G_oof_son.rst +++ b/docs/docs_5G_oof_son.rst @@ -92,7 +92,7 @@ We have introduced a new paradigm in the Kohn release and taken steps to harmoni For more information, please see: -- `5G-SON Kohn release wiki page `_. +- `5G-SON Kohn release wiki page `_. - `5G-SON Jakarta release wiki page `_. diff --git a/docs/docs_Testing_5G_PNF_Software_Upgrade_With_Schema_Update.rst b/docs/docs_Testing_5G_PNF_Software_Upgrade_With_Schema_Update.rst index b79d2aa21..eb549bb99 100644 --- a/docs/docs_Testing_5G_PNF_Software_Upgrade_With_Schema_Update.rst +++ b/docs/docs_Testing_5G_PNF_Software_Upgrade_With_Schema_Update.rst @@ -43,9 +43,9 @@ B. Update and re-distribute the service template: 2. Follow below mentioned procedure to update VSP and Service. - - `Update VF/PNF `_ + - `Update VF/PNF `_ - - `Update Service `_ + - `Update Service `_ C. Trigger PNF service level software upgrade with schema update: diff --git a/test/onaptests_bench/src/onaptests_bench/artifacts/settings.py b/test/onaptests_bench/src/onaptests_bench/artifacts/settings.py index b9f5c7ff3..ca189b2be 100644 --- a/test/onaptests_bench/src/onaptests_bench/artifacts/settings.py +++ b/test/onaptests_bench/src/onaptests_bench/artifacts/settings.py @@ -63,3 +63,18 @@ TILLER_HOST = "localhost" K8S_CONFIG = None # None means it will use default config (~/.kube/config) K8S_NAMESPACE = "onap" # Kubernetes namespace ORCHESTRATION_REQUEST_TIMEOUT = 60.0 * 30 # 30 minutes in seconds + +AAI_URL = "https://aai-api.simpledemo.onap.org" +CDS_URL = "https://cds-blueprintsprocessor-api.simpledemo.onap.org" +K8SPLUGIN_URL = "https://multicloud-k8s-api.simpledemo.onap.org" +MSB_URL = "https://msb-iag-ui.simpledemo.onap.org" +SDC_BE_URL = "https://sdc-be-api.simpledemo.onap.org" +SDC_FE_URL = "https://sdc-fe-ui.simpledemo.onap.org" +SDNC_URL = "https://sdnc-api.simpledemo.onap.org" +SO_URL = "https://so-api.simpledemo.onap.org" +CLAMP_URL = "https://policy-ui.simpledemo.onap.org" +VES_URL = "https://dcae-ves-collector-api.simpledemo.onap.org" +DMAAP_URL = "https://dmaap-mr-api.simpledemo.onap.org" +NBI_URL = "https://nbi-api.simpledemo.onap.org" +HOLMES_URL = "https://holmes-rule-mgmt-ui.simpledemo.onap.org" +AAI_GUI_URL = "https://aai-sparkybe-api.simpledemo.onap.org" diff --git a/test/onaptests_bench/src/onaptests_bench/launcher.py b/test/onaptests_bench/src/onaptests_bench/launcher.py index d7f96f329..5a7128c04 100644 --- a/test/onaptests_bench/src/onaptests_bench/launcher.py +++ b/test/onaptests_bench/src/onaptests_bench/launcher.py @@ -166,16 +166,16 @@ def execute_test(serie_number, test_number, stderr=True, stream=False, detach=True, - extra_hosts={'portal.api.simpledemo.onap.org':onap_ip, - 'vid.api.simpledemo.onap.org':onap_ip, - 'sdc.api.fe.simpledemo.onap.org':onap_ip, - 'sdc.api.be.simpledemo.onap.org':onap_ip, - 'aai.api.sparky.simpledemo.onap.org':onap_ip, - 'so.api.simpledemo.onap.org':onap_ip, - 'sdnc.api.simpledemo.onap.org':onap_ip, + extra_hosts={'portal-ui.simpledemo.onap.org':onap_ip, + 'vid-ui.simpledemo.onap.org':onap_ip, + 'sdc-fe-ui.simpledemo.onap.org':onap_ip, + 'sdc-be-api.simpledemo.onap.org':onap_ip, + 'aai-api.simpledemo.onap.org':onap_ip, + 'so-api.simpledemo.onap.org':onap_ip, + 'sdnc-api.simpledemo.onap.org':onap_ip, 'sdc.workflow.plugin.simpledemo.onap.org':onap_ip, 'sdc.dcae.plugin.simpledemo.onap.org':onap_ip, - 'msb.api.simpledemo.onap.org':onap_ip}, + 'multicloud-k8s-api.simpledemo.onap.org':onap_ip} volumes={'/tmp/xtesting/smoke-usecases/' + ARGS.test + '/env':{'bind': '/var/lib/xtesting/conf/env_file', 'mode': 'rw'}, # pylint: disable=line-too-long f'{HOMEPATH}/.config/openstack/clouds.yaml':{'bind': '/root/.config/openstack/clouds.yaml', 'mode': 'rw'}, # pylint: disable=line-too-long volume_reporting:{'bind':'/var/lib/xtesting/results', 'mode': 'rw'}, diff --git a/tox.ini b/tox.ini index f2bad2719..d3a4cfc42 100644 --- a/tox.ini +++ b/tox.ini @@ -36,15 +36,13 @@ commands = /bin/bash -c "coala --non-interactive --disable-caching --no-autoapply-warn py --files $( /tmp/.coalist_rst" deps = -r{toxinidir}/docs/requirements-docs.txt -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = - /bin/sh -c "sphinx-build -n -b html docs docs/build/html $(