diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-05-26 14:08:55 +0000 |
|---|---|---|
| committer | Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-05-26 14:09:27 +0000 |
| commit | 1a5aca00bda57f243a6f0b434658d8528bbf6457 (patch) | |
| tree | 5f0131986766621af1fbfbf952d2dec30cab0f6c | |
| parent | b7d4808b153c8c7271d57d1fc3970f43368a7f07 (diff) | |
Fix the order of cleanup of certain steps
Issue-ID: INT-2239
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: I3f7d4d7921e031c4d69ab19862421aeaba4595eb
| -rw-r--r-- | src/onaptests/steps/base.py | 3 | ||||
| -rw-r--r-- | src/onaptests/steps/cloud/k8s_connectivity_info_create.py | 2 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/cds.py | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/onaptests/steps/base.py b/src/onaptests/steps/base.py index b7651bb..0715545 100644 --- a/src/onaptests/steps/base.py +++ b/src/onaptests/steps/base.py @@ -235,9 +235,6 @@ class BaseStep(ABC): Not all steps has to have cleanup method """ - self._logger.info("*****************************") - self._logger.info("Start Cleanup step: " + self.name) - self._logger.info("*****************************") if self._cleanup: for step in self._steps: try: diff --git a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py b/src/onaptests/steps/cloud/k8s_connectivity_info_create.py index a492479..dfcda05 100644 --- a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py +++ b/src/onaptests/steps/cloud/k8s_connectivity_info_create.py @@ -42,6 +42,6 @@ class K8SConnectivityInfoStep(BaseStep): def cleanup(self) -> None: """Cleanup K8S Connectivity information.""" self._logger.info("Clean the k8s connectivity information") - super().cleanup() connectinfo = ConnectivityInfo.get_connectivity_info_by_region_id(settings.CLOUD_REGION_ID) connectinfo.delete() + super().cleanup() diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py index 0bad0cb..ad40fe5 100644 --- a/src/onaptests/steps/onboard/cds.py +++ b/src/onaptests/steps/onboard/cds.py @@ -207,8 +207,8 @@ class CbaEnrichStep(CDSBaseStep): Delete enriched CBA file. """ - super().cleanup() Path(settings.CDS_CBA_ENRICHED).unlink() + super().cleanup() class CbaPublishStep(CDSBaseStep): |