Merge "BaseScenario class added"

1 files changed, 6 insertions, 9 deletions

diff --git a/src/onaptests/scenario/basic_vm_macro.py b/src/onaptests/scenario/basic_vm_macro.py
index 3b10983..7159686 100644
--- a/src/onaptests/scenario/basic_vm_macro.py
+++ b/src/onaptests/scenario/basic_vm_macro.py
@@ -1,16 +1,16 @@
 """Instantiate basic vm using SO macro flow."""
 import logging
 import time
-from yaml import load, SafeLoader
 
 from onapsdk.configuration import settings
 from onapsdk.exceptions import SDKException
-from xtesting.core import testcase
-
+from onaptests.scenario.scenario_base import ScenarioBase
 from onaptests.steps.base import YamlTemplateBaseStep
+from onaptests.steps.instantiate.service_macro import \
+    YamlTemplateServiceMacroInstantiateStep
 from onaptests.steps.onboard.cds import CbaPublishStep
 from onaptests.utils.exceptions import OnapTestException
-from onaptests.steps.instantiate.service_macro import YamlTemplateServiceMacroInstantiateStep
+from yaml import SafeLoader, load
 
 
 class BasicVmMacroStep(YamlTemplateBaseStep):
@@ -98,17 +98,14 @@ class BasicVmMacroStep(YamlTemplateBaseStep):
         return settings.SERVICE_INSTANCE_NAME
 
 
-class BasicVmMacro(testcase.TestCase):
+class BasicVmMacro(ScenarioBase):
     """Instantiate a basic vm macro."""
 
     __logger = logging.getLogger()
 
     def __init__(self, **kwargs):
         """Init Basic Macro use case."""
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = 'basic_vm_macro'
-        super().__init__(**kwargs)
-        self.__logger.debug("Basic VM macro init started")
+        super().__init__('basic_vm_macro', **kwargs)
         self.test = BasicVmMacroStep(cleanup=settings.CLEANUP_FLAG)
 
     def run(self):