Merge "BaseScenario class added"

1 files changed, 6 insertions, 8 deletions

diff --git a/src/onaptests/scenario/basic_cnf.py b/src/onaptests/scenario/basic_cnf.py
index fb9a879..06f6f15 100644
--- a/src/onaptests/scenario/basic_cnf.py
+++ b/src/onaptests/scenario/basic_cnf.py
@@ -3,24 +3,22 @@
 import logging
 import time
 
-from xtesting.core import testcase
 from onapsdk.configuration import settings
 from onapsdk.exceptions import SDKException
-
-from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep
+from onaptests.scenario.scenario_base import ScenarioBase
+from onaptests.steps.instantiate.vf_module_ala_carte import \
+    YamlTemplateVfModuleAlaCarteInstantiateStep
 from onaptests.utils.exceptions import OnapTestException
 
-class BasicCnf(testcase.TestCase):
+
+class BasicCnf(ScenarioBase):
     """Onboard then instantiate a simple CNF with ONAP."""
 
     __logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
         """Init BasicCnf."""
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = 'basic_cnf'
-        super(BasicCnf, self).__init__(**kwargs)
-        self.__logger.debug("BasicCnf init started")
+        super().__init__('basic_cnf', **kwargs)
         self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
                 cleanup=settings.CLEANUP_FLAG)
         self.start_time = None