Add case_name as constructor arg

It allows managing multiple TestCase names with only one TestCase
module. It is mainly required by odl which implements:
  - odl,
  - odl_netvirt,
  - fds.

It also renames case to case_name in Features to conform with
TestCases.

JIRA: FUNCTEST-762

Change-Id: Ie254f754a0ea3077a8afda1c470528d38c79478f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

2 files changed, 2 insertions, 10 deletions

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index ccc1101a5..c0e2a9aeb 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -72,10 +72,6 @@ class ODLTests(testcase.TestCase):
     res_dir = '/home/opnfv/functest/results/odl/'
     logger = ft_logger.Logger("opendaylight").getLogger()
 
-    def __init__(self):
-        testcase.TestCase.__init__(self)
-        self.case_name = "odl"
-
     @classmethod
     def set_robotframework_vars(cls, odlusername="admin", odlpassword="admin"):
         """Set credentials in csit/variables/Variables.py.
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index d482ae320..fe37669a4 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -32,9 +32,6 @@ class OnosBase(testcase.TestCase):
     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:
@@ -52,9 +49,8 @@ class OnosBase(testcase.TestCase):
 
 
 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):