aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2022-04-01 15:15:26 +0200
committerLukasz Rajewski <lukasz.rajewski@orange.com>2022-04-04 21:53:10 +0200
commit4d1467f9290af4d64d329bc103893eaadd00e02c (patch)
treef84eec1786534b3e6fb0187995e1854aafc16313 /src
parent0846b669dd2bc9781743e40e11e33b8e164bfd51 (diff)
[TEST] Change of the k8sregion name
Change of the k8sregion name to avoid overlap between two different tests Issue-ID: TEST-384 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Ia734694e8ba9880f90888fed2182c753e11ed8c0
Diffstat (limited to 'src')
-rw-r--r--src/onaptests/configuration/basic_cnf_macro_settings.py4
-rw-r--r--src/onaptests/configuration/cds_resource_resolution_settings.py2
-rw-r--r--src/onaptests/configuration/pnf_macro_settings.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/onaptests/configuration/basic_cnf_macro_settings.py b/src/onaptests/configuration/basic_cnf_macro_settings.py
index 4433bf2..c124f2b 100644
--- a/src/onaptests/configuration/basic_cnf_macro_settings.py
+++ b/src/onaptests/configuration/basic_cnf_macro_settings.py
@@ -8,7 +8,7 @@ import onaptests.utils.exceptions as onap_test_exceptions
from .settings import * # pylint: disable=W0614
""" Specific basic_cnf_macro with multicloud-k8s and yaml config scenario."""
-SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a Apache CNF" +
+SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a Apache CNF " +
"using macro and native CNF path: cnf-adapter + K8sPlugin")
SERVICE_COMPONENTS = "SDC, DMAAP, AAI, SO, SDNC, CDS, Multicloud K8S"
@@ -31,7 +31,7 @@ K8S_CONFIG = get_resource_location("templates/artifacts/config")
VENDOR_NAME = "basiccnf_macro_vendor"
CLOUD_REGION_CLOUD_OWNER = "basiccnf-cloud-owner" # must not contain _
-CLOUD_REGION_ID = "k8sregion"
+CLOUD_REGION_ID = "k8sregion-cnf-macro"
CLOUD_REGION_TYPE = "k8s"
CLOUD_REGION_VERSION = "1.0"
CLOUD_DOMAIN = "Default"
diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py
index b18d2ac..c9626dd 100644
--- a/src/onaptests/configuration/cds_resource_resolution_settings.py
+++ b/src/onaptests/configuration/cds_resource_resolution_settings.py
@@ -7,7 +7,7 @@ from .settings import * # pylint: disable=W0614
CLEANUP_FLAG = True
SERVICE_NAME = "CDS resource resolution"
CLOUD_REGION_CLOUD_OWNER = "basicnf-owner" # must not contain _
-CLOUD_REGION_ID = "k8sregion"
+CLOUD_REGION_ID = "k8sregion-cds"
CLOUD_REGION_TYPE = "k8s"
CLOUD_REGION_VERSION = "1.0"
CLOUD_OWNER_DEFINED_TYPE = "N/A"
diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index 5f2b98c..a315525 100644
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -18,7 +18,7 @@ CDS_CBA_UNENRICHED = Path(get_resource_location("templates/artifacts/PNF_DEMO.zi
CDS_CBA_ENRICHED = "/tmp/PNF_DEMO_enriched.zip"
CLOUD_REGION_CLOUD_OWNER = "basicnf-owner" # must not contain _
-CLOUD_REGION_ID = "k8sregion"
+CLOUD_REGION_ID = "k8sregion-pnf-macro"
CLOUD_REGION_TYPE = "k8s"
CLOUD_REGION_VERSION = "1.0"
CLOUD_OWNER_DEFINED_TYPE = "N/A"