Merge "Change cleanup process of tests"

2 files changed, 6 insertions, 6 deletions

diff --git a/src/onaptests/steps/simulator/cds_mockserver.py b/src/onaptests/steps/simulator/cds_mockserver.py
index 9fc4162..75d0767 100644
--- a/src/onaptests/steps/simulator/cds_mockserver.py
+++ b/src/onaptests/steps/simulator/cds_mockserver.py
@@ -14,14 +14,14 @@ from onaptests.utils.exceptions import OnapTestException
 class CdsMockserverCnfConfigureStep(BaseStep):
     """Configure cds mockserver expectations."""
 
-    def __init__(self, cleanup: bool = False) -> None:
+    def __init__(self) -> None:
         """Initialize step.
 
         Substeps:
             - CreateInstanceStep.
         """
-        super().__init__(cleanup=cleanup)
-        self.add_step(CreateInstanceStep(cleanup=cleanup))
+        super().__init__(cleanup=BaseStep.HAS_NO_CLEANUP)
+        self.add_step(CreateInstanceStep())
 
     @property
     def description(self) -> str:
diff --git a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
index 2a4f47e..5adba2c 100644
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -17,14 +17,14 @@ from onaptests.utils.exceptions import EnvironmentPreparationException, OnapTest
 class PnfSimulatorCnfRegisterStep(BaseStep):
     """PNF simulator registration step."""
 
-    def __init__(self, cleanup: bool = False) -> None:
+    def __init__(self) -> None:
         """Initialize step.
 
         Substeps:
             - CreateInstanceStep.
         """
-        super().__init__(cleanup=cleanup)
-        self.add_step(CreateInstanceStep(cleanup=cleanup))
+        super().__init__(cleanup=BaseStep.HAS_NO_CLEANUP)
+        self.add_step(CreateInstanceStep())
 
     @property
     def description(self) -> str: