From 58a82a7e0a5bc010236991061aa959e55672028c Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Wed, 25 Aug 2021 17:44:25 +0200 Subject: [TEST] Unwind master back to 27.07.2020 Unwind master due to regression in few tests. Issue-ID: OOM-1 Change-Id: I3b759a5928aeb47fc7fddeaa5998aa090d085c5c Signed-off-by: Krzysztof Opasiak --- src/onaptests/configuration/pnf_macro_settings.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/onaptests/configuration/pnf_macro_settings.py') diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py index 6f59893..d9ccb1b 100644 --- a/src/onaptests/configuration/pnf_macro_settings.py +++ b/src/onaptests/configuration/pnf_macro_settings.py @@ -33,18 +33,15 @@ PLATFORM = "pnf_macro_platform" INSTANTIATION_TIMEOUT = 600 -MSB_K8S_CLEANUP_WAIT_TIME = 60 -MSB_K8S_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, +PNF_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent, "templates/artifacts/pnf-simulator.tar.gz") -MSB_K8S_RESOURCE_NAME_PREFIX = "pnf-cnf" -MSB_K8S_RB_NAME = f"{MSB_K8S_RESOURCE_NAME_PREFIX}-rb-{str(uuid4())}" -MSB_K8S_RB_VERSION = "v1" -MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, +PNF_RB_NAME = f"pnf-cnf-rb-{str(uuid4())}" +PNF_RB_VERSION = "v1" +PNF_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent, "templates/artifacts/profile.tar.gz") -MSB_K8S_PROFILE_NAME = f"{MSB_K8S_RESOURCE_NAME_PREFIX}-profile-{str(uuid4())}" +PNF_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" -- cgit 1.2.3-korg