Merge "Refactor code a bit to make status test able running on multiple namespaces"

[testsuite/pythonsdk-tests.git] / src / onaptests / scenario / basic_cnf.py

diff --git a/src/onaptests/scenario/basic_cnf.py b/src/onaptests/scenario/basic_cnf.py
index 6744781..5641f1f 100644 (file)
--- a/src/onaptests/scenario/basic_cnf.py
+++ b/src/onaptests/scenario/basic_cnf.py
@@ -1,47 +1,14 @@
 #!/usr/bin/env python
 """Basic CNF test case."""
-import logging
-import time
+from onaptests.scenario.scenario_base import ScenarioBase
+from onaptests.steps.instantiate.vf_module_ala_carte import \
+    YamlTemplateVfModuleAlaCarteInstantiateStep
 
-from xtesting.core import testcase
-from onapsdk.configuration import settings
-from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep
 
-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")
-        self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
-                cleanup=settings.CLEANUP_FLAG)
-        self.start_time = None
-        self.stop_time = None
-        self.result = 0
-
-    def run(self):
-        """Run onap_tests with basic_cnf VM."""
-        self.start_time = time.time()
-        self.__logger.debug("start time")
-        self.test.execute()
-        self.__logger.info("basic_cnf successfully created")
-        self.stop_time = time.time()
-        # The cleanup is part of the test, not only a teardown action
-        if settings.CLEANUP_FLAG:
-            self.__logger.info("basic_cnf cleanup called")
-            time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
-            self.test.cleanup()
-            self.result = 100
-        else:
-            self.__logger.info("No cleanup requested. Test completed.")
-            self.result = 100
-
-
-    def clean(self):
-        """Clean Additional resources if needed."""
-        pass
+        """Init BasicCnf."""
+        super().__init__('basic_cnf', **kwargs)
+        self.test = YamlTemplateVfModuleAlaCarteInstantiateStep()