Improved cleanup of service instances for failed cases

Issue-ID: TEST-402
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: I348fc625a8cd2ac7c2ee506f996a506c5a4bf4f3

2 files changed, 0 insertions, 29 deletions

diff --git a/src/onaptests/steps/onboard/clamp.py b/src/onaptests/steps/onboard/clamp.py
index 7cb20ff..22783c6 100644
--- a/src/onaptests/steps/onboard/clamp.py
+++ b/src/onaptests/steps/onboard/clamp.py
@@ -58,21 +58,6 @@ class OnboardClampStep(YamlTemplateBaseStep):
     def model_yaml_template(self) -> dict:
         return {}
 
-    @property
-    def service_name(self) -> str:
-        """Service name.
-
-        Get from YAML template if it's a root step, get from parent otherwise.
-
-        Returns:
-            str: Service name
-
-        """
-        if self.is_root:
-            return next(iter(self.yaml_template.keys()))
-        else:
-            return self.parent.service_name
-
     @YamlTemplateBaseStep.store_state
     def execute(self):
         """Onboard service."""
diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py
index be0f6fd..bcf153f 100644
--- a/src/onaptests/steps/onboard/service.py
+++ b/src/onaptests/steps/onboard/service.py
@@ -171,20 +171,6 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
             return self._model_yaml_template
         return self.parent.model_yaml_template
 
-    @property
-    def service_name(self) -> str:
-        """Service name.
-
-        Get from YAML template if it's a root step, get from parent otherwise.
-
-        Returns:
-            str: Service name
-
-        """
-        if self.is_root:
-            return next(iter(self.yaml_template.keys()))
-        return self.parent.service_name
-
     @YamlTemplateBaseStep.store_state
     def execute(self):
         """Onboard service."""