diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-03-24 15:38:53 +0000 |
|---|---|---|
| committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-03-29 07:01:44 +0000 |
| commit | 6f184d09e0670feaa2817dbbe85a42c6bd880578 (patch) | |
| tree | 85eaf8b3f72d2e644cd3bacf40cc7c0addc84f7d /src/onaptests/steps | |
| parent | 066e6c39c2a5133f89d1f00f25a247f7ce402f10 (diff) | |
Test pnf_macro fix
Configure and check service distribuiton for 30 minutes
Issue-ID: INT-2193
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I316a3e5c179530ba92c87c43795643e9faf30048
Diffstat (limited to 'src/onaptests/steps')
| -rw-r--r-- | src/onaptests/steps/instantiate/service_macro.py | 10 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/service.py | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/onaptests/steps/instantiate/service_macro.py b/src/onaptests/steps/instantiate/service_macro.py index dc2ce89..b32d936 100644 --- a/src/onaptests/steps/instantiate/service_macro.py +++ b/src/onaptests/steps/instantiate/service_macro.py @@ -166,8 +166,8 @@ class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep): self._logger.info("******** Check Service Distribution *******") distribution_completed = False nb_try = 0 - nb_try_max = 10 - while distribution_completed is False and nb_try < nb_try_max: + while distribution_completed is False and \ + nb_try < settings.SERVICE_DISTRIBUTION_NUMBER_OF_TRIES: distribution_completed = service.distributed if distribution_completed is True: self._logger.info( @@ -175,9 +175,9 @@ class YamlTemplateServiceMacroInstantiateStep(YamlTemplateBaseStep): service.name) break self._logger.info( - "Service Distribution for %s ongoing, Wait for 60 s", - service.name) - time.sleep(60) + "Service Distribution for %s ongoing, Wait for %d s", + service.name,settings.SERVICE_DISTRIBUTION_SLEEP_TIME) + time.sleep(settings.SERVICE_DISTRIBUTION_SLEEP_TIME) nb_try += 1 if distribution_completed is False: diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py index d176697..b1e7d4d 100644 --- a/src/onaptests/steps/onboard/service.py +++ b/src/onaptests/steps/onboard/service.py @@ -266,8 +266,9 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep): @YamlTemplateBaseStep.store_state(cleanup=True) def cleanup(self) -> None: """Cleanup service onboard step.""" - service: Service = Service(name=self.service_name) - if service.exists(): - service.archive() - service.delete() - super().cleanup() + if settings.SDC_CLEANUP: + service: Service = Service(name=self.service_name) + if service.exists(): + service.archive() + service.delete() + super().cleanup() |