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>

4 files changed, 8 insertions, 7 deletions

diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index bdedcf7c..f80e7bcc 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -21,7 +21,7 @@ class AaaVnf(vnf_base.VnfOnBoardingBase):
     logger = ft_logger.Logger("VNF AAA").getLogger()
 
     def __init__(self):
-        super(AaaVnf, self).__init__(case="aaa")
+        super(AaaVnf, self).__init__(case_name="aaa")
 
     def deploy_orchestrator(self):
         self.logger.info("No VNFM needed to deploy a free radius here")
@@ -56,6 +56,7 @@ class AaaVnf(vnf_base.VnfOnBoardingBase):
         kwargs = {}
         return self.main(**kwargs)
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     args = vars(parser.parse_args())
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index 404f208e..d739335d 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -25,9 +25,9 @@ import functest.utils.openstack_utils as os_utils
 
 class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
 
-    def __init__(self, project='functest', case='cloudify_ims',
+    def __init__(self, project='functest', case_name='cloudify_ims',
                  repo='', cmd=''):
-        super(CloudifyIms, self).__init__(project, case, repo, cmd)
+        super(CloudifyIms, self).__init__(project, case_name, repo, cmd)
         self.logger = ft_logger.Logger(__name__).getLogger()
 
         # Retrieve the configuration
diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py
index d022b3c7..7ca96ae1 100644
--- a/functest/opnfv_tests/vnf/ims/opera_ims.py
+++ b/functest/opnfv_tests/vnf/ims/opera_ims.py
@@ -21,9 +21,9 @@ import functest.utils.functest_logger as ft_logger
 
 class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase):
 
-    def __init__(self, project='functest', case='opera_ims',
+    def __init__(self, project='functest', case_name='opera_ims',
                  repo=CONST.dir_repo_opera, cmd=''):
-        super(OperaIms, self).__init__(project, case, repo, cmd)
+        super(OperaIms, self).__init__(project, case_name, repo, cmd)
         self.logger = ft_logger.Logger(__name__).getLogger()
         self.ellis_file = os.path.join(self.result_dir, 'ellis.info')
         self.live_test_file = os.path.join(self.result_dir,
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index 5c19be09..213d690d 100755
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -78,9 +78,9 @@ def servertest(host, port):
 
 class ImsVnf(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='orchestra_ims',
+    def __init__(self, project='functest', case_name='orchestra_ims',
                  repo='', cmd=''):
-        super(ImsVnf, self).__init__(project, case, repo, cmd)
+        super(ImsVnf, self).__init__(project, case_name, repo, cmd)
         self.ob_password = "openbaton"
         self.ob_username = "admin"
         self.ob_https = False