Add case_name as constructor arg

[functest.git] / functest / opnfv_tests / sdn / onos / onos.py

diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index 8bc7383..fe37669 100644 (file)
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -14,7 +14,7 @@ import shutil
 import time
 import urlparse
 
-from functest.core import testcase_base
+from functest.core import testcase
 from functest.utils.constants import CONST
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
@@ -24,7 +24,7 @@ import functest.utils.openstack_utils as openstack_utils
 logger = ft_logger.Logger(__name__).getLogger()
 
 
-class OnosBase(testcase_base.TestcaseBase):
+class OnosBase(testcase.TestCase):
     onos_repo_path = CONST.dir_repo_onos
     onos_sfc_image_name = CONST.onos_sfc_image_name
     onos_sfc_image_path = os.path.join(CONST.dir_functest_data,
@@ -32,17 +32,14 @@ class OnosBase(testcase_base.TestcaseBase):
     onos_sfc_path = os.path.join(CONST.dir_repo_functest,
                                  CONST.dir_onos_sfc)
 
-    def __init__(self):
-        super(OnosBase, self).__init__()
-
     def run(self):
         self.start_time = time.time()
         try:
             self._run()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s', e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         return res
@@ -52,9 +49,8 @@ class OnosBase(testcase_base.TestcaseBase):
 
 
 class Onos(OnosBase):
-    def __init__(self):
-        super(Onos, self).__init__()
-        self.case_name = 'onos'
+    def __init__(self, case_name='onos'):
+        super(Onos, self).__init__(case_name)
         self.log_path = os.path.join(self.onos_repo_path, 'TestON/logs')
 
     def set_onos_ip(self):