diff options
author | Micha? Jagie??o <michal.jagiello@t-mobile.pl> | 2023-08-07 13:06:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2023-08-07 13:06:39 +0000 |
commit | f79b8e825e0e3cbde157e29a3225f9357e4198bd (patch) | |
tree | 72494a6d436ce591b54cf621ccec4c68f8154ed7 /src/onaptests/steps/instantiate/service_macro.py | |
parent | be6ea937c20fb6ba83d6c7b35f6f5677f9a355cc (diff) | |
parent | 4bccbde3060931c8fcf61fbf8b61db4a85b3200e (diff) |
Merge "Change cleanup process of tests"
Diffstat (limited to 'src/onaptests/steps/instantiate/service_macro.py')
-rw-r--r-- | src/onaptests/steps/instantiate/service_macro.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/onaptests/steps/instantiate/service_macro.py b/src/onaptests/steps/instantiate/service_macro.py index d97a109..88eef4d 100644 --- a/src/onaptests/steps/instantiate/service_macro.py +++ b/src/onaptests/steps/instantiate/service_macro.py @@ -34,7 +34,7 @@ from onaptests.steps.cloud.connect_service_subscription_to_cloud_region import ( class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep): """Instantiate service a'la carte using YAML template.""" - def __init__(self, cleanup=False): + def __init__(self): """Initialize step. Substeps: @@ -42,21 +42,21 @@ class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep): - ConnectServiceSubToCloudRegionStep, - CustomerServiceSubscriptionCreateStep. """ - super().__init__(cleanup=cleanup) + super().__init__(cleanup=settings.CLEANUP_FLAG) self._yaml_template: dict = None self._model_yaml_template: dict = None self._service_instance_name: str = None self._service_instance: str = None if not settings.ONLY_INSTANTIATE: - self.add_step(YamlTemplateServiceOnboardStep(cleanup)) + self.add_step(YamlTemplateServiceOnboardStep()) if any( filter(lambda x: x in self.yaml_template[self.service_name].keys(), ["vnfs", "networks"])): # can additionally contain "pnfs", no difference - self.add_step(ConnectServiceSubToCloudRegionStep(cleanup)) + self.add_step(ConnectServiceSubToCloudRegionStep()) else: # only pnfs - self.add_step(CustomerServiceSubscriptionCreateStep(cleanup)) + self.add_step(CustomerServiceSubscriptionCreateStep()) @property def description(self) -> str: |