diff options
| author |   Micha? Jagie??o <michal.jagiello@t-mobile.pl> | 2023-05-29 10:20:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-05-29 10:20:29 +0000 |
| commit | 4299fadeddffd2d24eb672fb26e6fa7cc141899f (patch) | |
| tree | e02cc42eccd8aca78cf06f33cd2a69bec2fd2f8d | |
| parent | 52a8347b34edf48126aff3121655920220fbb2b4 (diff) | |
| parent | 1a5aca00bda57f243a6f0b434658d8528bbf6457 (diff) | |
Merge "Fix the order of cleanup of certain steps"
| -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): |