diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2021-12-20 07:25:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-12-20 07:25:45 +0000 |
| commit | 2bd16f8898e6fd74e64b1500eb5fbc4448517d1a (patch) | |
| tree | 6511af60374903774c8e0c2ed581bbcabce89e5b /src/onaptests/configuration | |
| parent | fdb23f5d0a2ac49ac35578be855f2b937741136f (diff) | |
| parent | 54803e59a08d09bbb34cb686740f41b1e7bc3684 (diff) | |
Merge "[TEST] Do not create simulators in "onap" namespace"
Diffstat (limited to 'src/onaptests/configuration')
| -rw-r--r-- | src/onaptests/configuration/cds_resource_resolution_settings.py | 15 | ||||
| -rw-r--r-- | src/onaptests/configuration/pnf_macro_settings.py | 11 | ||||
| -rw-r--r-- | src/onaptests/configuration/settings.py | 3 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py index bb3b85b..16e23a6 100644 --- a/src/onaptests/configuration/cds_resource_resolution_settings.py +++ b/src/onaptests/configuration/cds_resource_resolution_settings.py @@ -12,15 +12,16 @@ CLOUD_REGION_VERSION = "1.0" CLOUD_OWNER_DEFINED_TYPE = "N/A" COMPLEX_PHYSICAL_LOCATION_ID = "sdktests" -PNF_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, - "templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz") -PNF_RB_NAME = f"cds-ms-rb-{str(uuid4())}" -PNF_RB_VERSION = "v1" -PNF_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, - "templates/artifacts/profile.tar.gz") -PNF_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}" +MSB_K8S_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, + "templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz") +MSB_K8S_RB_NAME = f"cds-ms-rb-{str(uuid4())}" +MSB_K8S_RB_VERSION = "v1" +MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, + "templates/artifacts/profile.tar.gz") +MSB_K8S_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}" K8S_VERSION = "1.0" K8S_CONFIG = str(Path(Path(__file__).parent.parent, "templates/artifacts/config")) +K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" CDS_MOCKSERVER_EXPECTATIONS = [ { "method": "GET", diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py index 515fce1..eaca93a 100644 --- a/src/onaptests/configuration/pnf_macro_settings.py +++ b/src/onaptests/configuration/pnf_macro_settings.py @@ -33,15 +33,16 @@ PLATFORM = "pnf_macro_platform" INSTANTIATION_TIMEOUT = 600 -PNF_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, +MSB_K8S_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, "templates/artifacts/pnf-simulator.tar.gz") -PNF_RB_NAME = f"pnf-cnf-rb-{str(uuid4())}" -PNF_RB_VERSION = "v1" -PNF_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, +MSB_K8S_RB_NAME = f"pnf-cnf-rb-{str(uuid4())}" +MSB_K8S_RB_VERSION = "v1" +MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, "templates/artifacts/profile.tar.gz") -PNF_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}" +MSB_K8S_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}" K8S_VERSION = "1.0" K8S_CONFIG = str(Path(Path(__file__).parent.parent, "templates/artifacts/config")) +K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" SERVICE_INSTANCE_NAME = "TestPNFMacroInstantiation" diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py index 491e5e0..e6f894d 100644 --- a/src/onaptests/configuration/settings.py +++ b/src/onaptests/configuration/settings.py @@ -43,7 +43,8 @@ REPORTING_FILE_PATH = "/tmp/reporting.html" K8S_REGION_TYPE = "k8s" TILLER_HOST = "localhost" K8S_CONFIG = None # None means it will use default config (~/.kube/config) -K8S_NAMESPACE = "onap" # Kubernetes namespace +K8S_ONAP_NAMESPACE = "onap" # ONAP Kubernetes namespace +K8S_ADDITIONAL_RESOURCES_NAMESPACE = K8S_ONAP_NAMESPACE # Resources created on tests namespace #SOCK_HTTP = "socks5h://127.0.0.1:8091" ORCHESTRATION_REQUEST_TIMEOUT = 60.0 * 15 # 15 minutes in seconds |