From 0e935eede33969dc963fcc063713d3f4866bdf85 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Wed, 18 Oct 2023 15:44:19 +0200 Subject: Make pnf-simulator helm chart configurable PNF simulator couldn't be configured on demand (e.g. image couldn't be changed) That version allows override values and run customized version of pnf-simulator Issue-ID: TEST-404 Signed-off-by: Michal Jagiello Change-Id: Ic18bdaeaa782b61478579056d5ba1a893087d85c --- .../configuration/cds_resource_resolution_settings.py | 1 + src/onaptests/configuration/pnf_macro_settings.py | 1 + src/onaptests/steps/instantiate/msb_k8s.py | 3 ++- .../templates/artifacts/pnf-simulator.tar.gz | Bin 1223 -> 1366 bytes 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py index 0ab6ebc..b972d0c 100644 --- a/src/onaptests/configuration/cds_resource_resolution_settings.py +++ b/src/onaptests/configuration/cds_resource_resolution_settings.py @@ -21,6 +21,7 @@ MSB_K8S_RB_VERSION = "v1" MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location( "templates/artifacts/profile.tar.gz")) MSB_K8S_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}" +MSB_K8S_OVERRIDE_VALUES = None K8S_VERSION = "1.0" K8S_CONFIG = get_resource_location("templates/artifacts/config") K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py index d332763..379eaf7 100644 --- a/src/onaptests/configuration/pnf_macro_settings.py +++ b/src/onaptests/configuration/pnf_macro_settings.py @@ -38,6 +38,7 @@ MSB_K8S_RB_VERSION = "v1" MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location( "templates/artifacts/profile.tar.gz")) MSB_K8S_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}" +MSB_K8S_OVERRIDE_VALUES = None K8S_VERSION = "1.0" K8S_CONFIG = get_resource_location("templates/artifacts/config") K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests" diff --git a/src/onaptests/steps/instantiate/msb_k8s.py b/src/onaptests/steps/instantiate/msb_k8s.py index 9189282..29bc84a 100644 --- a/src/onaptests/steps/instantiate/msb_k8s.py +++ b/src/onaptests/steps/instantiate/msb_k8s.py @@ -36,7 +36,8 @@ class CreateInstanceStep(BaseStep): self.instance = Instance.create(cloud_region_id=settings.CLOUD_REGION_ID, profile_name=settings.MSB_K8S_PROFILE_NAME, rb_name=settings.MSB_K8S_RB_NAME, - rb_version=settings.MSB_K8S_RB_VERSION) + rb_version=settings.MSB_K8S_RB_VERSION, + override_values=settings.MSB_K8S_OVERRIDE_VALUES) @BaseStep.store_state(cleanup=True) def cleanup(self) -> None: diff --git a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz index b715b1c..024f732 100644 Binary files a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz and b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz differ -- cgit 1.2.3-korg