Modify TestCase constructor attributes

Every feature/testcase now allows receiving the data defined in
testcases.yaml as args (name is renamed to case_name).

From the time being, only project and case names are handled. Next
pending patches will add criteria, cmd and repo to this list.

It keeps the default values for case names except for features which
will be aggregated into Feature.

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

27 files changed, 125 insertions, 97 deletions

diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py
index 6207f581..cd3062cc 100644
--- a/functest/opnfv_tests/features/barometer.py
+++ b/functest/opnfv_tests/features/barometer.py
@@ -16,10 +16,9 @@ class BarometerCollectd(base.Feature):
     Class for executing barometercollectd testcase.
     '''
 
-    def __init__(self, case_name='barometercollectd'):
-        super(BarometerCollectd, self).__init__(project='barometer',
-                                                case_name=case_name,
-                                                repo='dir_repo_barometer')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_barometer'
+        super(BarometerCollectd, self).__init__(**kwargs)
 
     def execute(self):
         return collectd.main(self.logger)
diff --git a/functest/opnfv_tests/features/copper.py b/functest/opnfv_tests/features/copper.py
index 5b88a499..e5c3f8bd 100644
--- a/functest/opnfv_tests/features/copper.py
+++ b/functest/opnfv_tests/features/copper.py
@@ -18,8 +18,7 @@ import functest.core.feature as base
 
 
 class Copper(base.Feature):
-    def __init__(self, case_name='copper-notification'):
-        super(Copper, self).__init__(project='copper',
-                                     case_name=case_name,
-                                     repo='dir_repo_copper')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_copper'
+        super(Copper, self).__init__(**kwargs)
         self.cmd = 'cd %s/tests && bash run.sh && cd -' % self.repo
diff --git a/functest/opnfv_tests/features/doctor.py b/functest/opnfv_tests/features/doctor.py
index fd181a04..3a2cc7df 100644
--- a/functest/opnfv_tests/features/doctor.py
+++ b/functest/opnfv_tests/features/doctor.py
@@ -17,8 +17,7 @@ import functest.core.feature as base
 
 
 class Doctor(base.Feature):
-    def __init__(self, case_name='doctor-notification'):
-        super(Doctor, self).__init__(project='doctor',
-                                     case_name=case_name,
-                                     repo='dir_repo_doctor')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_doctor'
+        super(Doctor, self).__init__(**kwargs)
         self.cmd = 'cd %s/tests && ./run.sh' % self.repo
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
index 1c620235..629c8d54 100644
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -18,8 +18,7 @@ import functest.core.feature as base
 
 
 class Domino(base.Feature):
-    def __init__(self, case_name='domino-multinode'):
-        super(Domino, self).__init__(project='domino',
-                                     case_name=case_name,
-                                     repo='dir_repo_domino')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_domino'
+        super(Domino, self).__init__(**kwargs)
         self.cmd = 'cd %s && ./tests/run_multinode.sh' % self.repo
diff --git a/functest/opnfv_tests/features/netready.py b/functest/opnfv_tests/features/netready.py
index ada322c1..f7bab08b 100644
--- a/functest/opnfv_tests/features/netready.py
+++ b/functest/opnfv_tests/features/netready.py
@@ -13,10 +13,9 @@ import functest.core.feature as base
 
 class GluonVping(base.Feature):
 
-    def __init__(self, case_name='gluon_vping'):
-        super(GluonVping, self).__init__(project='netready',
-                                         case_name=case_name,
-                                         repo='dir_repo_netready')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_netready'
+        super(GluonVping, self).__init__(**kwargs)
         dir_netready_functest = '{}/test/functest'.format(self.repo)
         self.cmd = ('cd %s && python ./gluon-test-suite.py' %
                     dir_netready_functest)
diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py
index f96683e3..d4f4eb67 100644
--- a/functest/opnfv_tests/features/odl_sfc.py
+++ b/functest/opnfv_tests/features/odl_sfc.py
@@ -12,9 +12,8 @@ import functest.core.feature as base
 
 class OpenDaylightSFC(base.Feature):
 
-    def __init__(self, case_name='functest-odl-sfc'):
-        super(OpenDaylightSFC, self).__init__(project='sfc',
-                                              case_name=case_name,
-                                              repo='dir_repo_sfc')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_sfc'
+        super(OpenDaylightSFC, self).__init__(**kwargs)
         dir_sfc_functest = '{}/sfc/tests/functest'.format(self.repo)
         self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest
diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py
index e3dc7fdf..49eb8a08 100644
--- a/functest/opnfv_tests/features/promise.py
+++ b/functest/opnfv_tests/features/promise.py
@@ -16,9 +16,8 @@ import functest.core.feature as base
 
 
 class Promise(base.Feature):
-    def __init__(self, case_name='promise'):
-        super(Promise, self).__init__(project='promise',
-                                      case_name=case_name,
-                                      repo='dir_repo_promise')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_promise'
+        super(Promise, self).__init__(**kwargs)
         dir_promise_functest = '{}/promise/test/functest'.format(self.repo)
         self.cmd = 'cd %s && python ./run_tests.py' % dir_promise_functest
diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py
index 5e9254a0..6a1071ff 100644
--- a/functest/opnfv_tests/features/sdnvpn.py
+++ b/functest/opnfv_tests/features/sdnvpn.py
@@ -12,9 +12,8 @@ import functest.core.feature as base
 
 class SdnVpnTests(base.Feature):
 
-    def __init__(self, case_name='bgpvpn'):
-        super(SdnVpnTests, self).__init__(project='sdnvpn',
-                                          case_name=case_name,
-                                          repo='dir_repo_sdnvpn')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_sdnvpn'
+        super(SdnVpnTests, self).__init__(**kwargs)
         dir_sfc_functest = '{}/sdnvpn/test/functest'.format(self.repo)
         self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest
diff --git a/functest/opnfv_tests/features/security_scan.py b/functest/opnfv_tests/features/security_scan.py
index e7256380..2ed9a823 100644
--- a/functest/opnfv_tests/features/security_scan.py
+++ b/functest/opnfv_tests/features/security_scan.py
@@ -13,10 +13,9 @@ from functest.utils.constants import CONST
 
 
 class SecurityScan(base.Feature):
-    def __init__(self, case_name='security_scan'):
-        super(SecurityScan, self).__init__(project='securityscanning',
-                                           case_name=case_name,
-                                           repo='dir_repo_securityscan')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_securityscan'
+        super(SecurityScan, self).__init__(**kwargs)
         self.cmd = ('. {0}/stackrc && '
                     'cd {1} && '
                     'python security_scan.py --config config.ini && '
diff --git a/functest/opnfv_tests/mano/orchestra.py b/functest/opnfv_tests/mano/orchestra.py
index a9cf0ae6..dea26efc 100644
--- a/functest/opnfv_tests/mano/orchestra.py
+++ b/functest/opnfv_tests/mano/orchestra.py
@@ -16,9 +16,12 @@ import functest.core.feature as base
 
 
 class Orchestra(base.Feature):
-    def __init__(self):
-        super(Orchestra, self).__init__(project='orchestra',
-                                        case='orchestra',
-                                        repo='dir_repo_orchestra')
+    def __init__(self, **kwargs):
+        if "project_name" not in kwargs:
+            kwargs["project_name"] = "orchestra"
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "orchestra"
+        kwargs['repo'] = 'dir_repo_orchestra'
+        super(Orchestra, self).__init__(**kwargs)
         # TODO
         # self.cmd = "%s/tests/run.sh %s/tests" % (self.repo, self.repo)
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index e7411c51..ad8745c7 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -56,8 +56,8 @@ class RallyBase(testcase.TestCase):
     RALLY_PRIVATE_SUBNET_CIDR = CONST.rally_subnet_cidr
     RALLY_ROUTER_NAME = CONST.rally_router_name
 
-    def __init__(self, case_name=''):
-        super(RallyBase, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        super(RallyBase, self).__init__(**kwargs)
         self.mode = ''
         self.summary = []
         self.scenario_dir = ''
@@ -536,8 +536,10 @@ class RallyBase(testcase.TestCase):
 
 
 class RallySanity(RallyBase):
-    def __init__(self, case_name="rally_sanity"):
-        super(RallySanity, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "rally_sanity"
+        super(RallySanity, self).__init__(**kwargs)
         self.mode = 'sanity'
         self.test_name = 'all'
         self.smoke = True
@@ -545,8 +547,10 @@ class RallySanity(RallyBase):
 
 
 class RallyFull(RallyBase):
-    def __init__(self, case_name="rally_full"):
-        super(RallyFull, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "rally_full"
+        super(RallyFull, self).__init__(**kwargs)
         self.mode = 'full'
         self.test_name = 'all'
         self.smoke = False
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 441abfee..c708a223 100755
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -25,8 +25,10 @@ logger = ft_logger.Logger("refstack_defcore").getLogger()
 
 class RefstackClient(testcase.TestCase):
 
-    def __init__(self, case_name="refstack_defcore"):
-        super(RefstackClient, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "refstack_defcore"
+        super(RefstackClient, self).__init__(**kwargs)
         self.FUNCTEST_TEST = CONST.dir_functest_test
         self.CONF_PATH = CONST.refstack_tempest_conf_path
         self.DEFCORE_LIST = CONST.refstack_defcore_list
diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py
index dea1ca75..bceb7c1d 100644
--- a/functest/opnfv_tests/openstack/snaps/api_check.py
+++ b/functest/opnfv_tests/openstack/snaps/api_check.py
@@ -20,8 +20,10 @@ class ApiCheck(SnapsTestRunner):
     that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
     and Nova
     """
-    def __init__(self, case_name="api_check"):
-        super(ApiCheck, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "api_check"
+        super(ApiCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
 
diff --git a/functest/opnfv_tests/openstack/snaps/connection_check.py b/functest/opnfv_tests/openstack/snaps/connection_check.py
index 57b74d4c..0607beb3 100644
--- a/functest/opnfv_tests/openstack/snaps/connection_check.py
+++ b/functest/opnfv_tests/openstack/snaps/connection_check.py
@@ -20,8 +20,10 @@ class ConnectionCheck(SnapsTestRunner):
     that simply obtain the different OpenStack clients and may perform
     simple queries
     """
-    def __init__(self, case_name="connection_check"):
-        super(ConnectionCheck, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "connection_check"
+        super(ConnectionCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
 
diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py
index 6b3cfdd0..245f5052 100644
--- a/functest/opnfv_tests/openstack/snaps/health_check.py
+++ b/functest/opnfv_tests/openstack/snaps/health_check.py
@@ -21,8 +21,10 @@ class HealthCheck(SnapsTestRunner):
     creates a VM with a single port with an IPv4 address that is assigned by
     DHCP. This test then validates the expected IP with the actual
     """
-    def __init__(self, case_name="snaps_health_check"):
-        super(HealthCheck, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "snaps_health_check"
+        super(HealthCheck, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
 
diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py
index 63d5c122..ceead6bb 100644
--- a/functest/opnfv_tests/openstack/snaps/smoke.py
+++ b/functest/opnfv_tests/openstack/snaps/smoke.py
@@ -21,8 +21,10 @@ class SnapsSmoke(SnapsTestRunner):
     that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
     and Nova
     """
-    def __init__(self, case_name="snaps_smoke"):
-        super(SnapsSmoke, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "snaps_smoke"
+        super(SnapsSmoke, self).__init__(**kwargs)
 
         self.suite = unittest.TestSuite()
         use_fip = CONST.snaps_use_floating_ips
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 044a0bb0..2068852e 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -19,8 +19,8 @@ class SnapsTestRunner(PyTestSuiteRunner):
     creates a VM with a single port with an IPv4 address that is assigned by
     DHCP. This test then validates the expected IP with the actual
     """
-    def __init__(self, case_name=''):
-        super(SnapsTestRunner, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        super(SnapsTestRunner, self).__init__(**kwargs)
 
         self.ext_net_name = snaps_utils.get_ext_net_name()
         self.logger = ft_logger.Logger(self.project_name).getLogger()
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index c3184e35..8b175c25 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -28,8 +28,8 @@ logger = ft_logger.Logger("Tempest").getLogger()
 
 class TempestCommon(testcase.TestCase):
 
-    def __init__(self, case_name=''):
-        super(TempestCommon, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        super(TempestCommon, self).__init__(**kwargs)
         self.MODE = ""
         self.OPTION = ""
         self.VERIFIER_ID = conf_utils.get_verifier_id()
@@ -234,31 +234,39 @@ class TempestCommon(testcase.TestCase):
 
 class TempestSmokeSerial(TempestCommon):
 
-    def __init__(self, case_name='tempest_smoke_serial'):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'tempest_smoke_serial'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "smoke"
         self.OPTION = "--concurrency 1"
 
 
 class TempestSmokeParallel(TempestCommon):
 
-    def __init__(self, case_name='tempest_smoke_parallel'):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'tempest_smoke_parallel'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "smoke"
         self.OPTION = ""
 
 
 class TempestFullParallel(TempestCommon):
 
-    def __init__(self, case_name="tempest_full_parallel"):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'tempest_full_parallel'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "full"
 
 
 class TempestMultisite(TempestCommon):
 
-    def __init__(self, case_name="multisite"):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'multisite'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "feature_multisite"
         self.OPTION = "--concurrency 1"
         conf_utils.install_verifier_ext(CONST.dir_repo_kingbird)
@@ -266,15 +274,19 @@ class TempestMultisite(TempestCommon):
 
 class TempestCustom(TempestCommon):
 
-    def __init__(self, case_name="tempest_custom"):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'tempest_custom'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "custom"
         self.OPTION = "--concurrency 1"
 
 
 class TempestDefcore(TempestCommon):
 
-    def __init__(self, case_name="tempest_defcore"):
-        TempestCommon.__init__(self, case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'tempest_defcore'
+        TempestCommon.__init__(self, **kwargs)
         self.MODE = "defcore"
         self.OPTION = "--concurrency 1"
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 64cb0004..8f7cc1d2 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -18,8 +18,8 @@ from functest.utils.constants import CONST
 
 
 class VPingBase(testcase.TestCase):
-    def __init__(self, case_name=''):
-        super(VPingBase, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        super(VPingBase, self).__init__(**kwargs)
         self.logger = None
         self.functest_repo = CONST.dir_repo_functest
         self.repo = CONST.dir_vping
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index a68b0ff7..c26c4e0c 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -24,8 +24,10 @@ import functest.core.testcase as testcase
 
 class VPingSSH(vping_base.VPingBase):
 
-    def __init__(self, case_name='vping_ssh'):
-        super(VPingSSH, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "vping_ssh"
+        super(VPingSSH, self).__init__(**kwargs)
         self.logger = ft_logger.Logger(self.case_name).getLogger()
 
     def do_vping(self, vm, test_ip):
diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index e9b86998..1b00ca23 100755
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -18,8 +18,10 @@ import vping_base
 
 class VPingUserdata(vping_base.VPingBase):
 
-    def __init__(self, case_name='vping_userdata'):
-        super(VPingUserdata, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "vping_userdata"
+        super(VPingUserdata, self).__init__(**kwargs)
         self.logger = ft_logger.Logger(self.case_name).getLogger()
 
     def boot_vm_preparation(self, config, vmname, test_ip):
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index fe37669a..fe496c1f 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -49,8 +49,10 @@ class OnosBase(testcase.TestCase):
 
 
 class Onos(OnosBase):
-    def __init__(self, case_name='onos'):
-        super(Onos, self).__init__(case_name)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "onos"
+        super(Onos, self).__init__(**kwargs)
         self.log_path = os.path.join(self.onos_repo_path, 'TestON/logs')
 
     def set_onos_ip(self):
diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index f80e7bcc..6de65bcd 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -20,8 +20,10 @@ class AaaVnf(vnf_base.VnfOnBoardingBase):
 
     logger = ft_logger.Logger("VNF AAA").getLogger()
 
-    def __init__(self):
-        super(AaaVnf, self).__init__(case_name="aaa")
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "aaa"
+        super(AaaVnf, self).__init__(**kwargs)
 
     def deploy_orchestrator(self):
         self.logger.info("No VNFM needed to deploy a free radius here")
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index 2fc5449c..494633f4 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -20,13 +20,12 @@ import functest.utils.functest_utils as ft_utils
 
 class ClearwaterOnBoardingBase(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='', repo='', cmd=''):
+    def __init__(self, **kwargs):
         self.logger = ft_logger.Logger(__name__).getLogger()
-        super(ClearwaterOnBoardingBase, self).__init__(
-            project, case, repo, cmd)
+        super(ClearwaterOnBoardingBase, self).__init__(**kwargs)
         self.case_dir = os.path.join(CONST.dir_functest_test, 'vnf', 'ims')
         self.data_dir = CONST.dir_ims_data
-        self.result_dir = os.path.join(CONST.dir_results, case)
+        self.result_dir = os.path.join(CONST.dir_results, self.case_name)
         self.test_dir = CONST.dir_repo_vims_test
 
         if not os.path.exists(self.data_dir):
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index d739335d..e351e0d9 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -25,9 +25,10 @@ import functest.utils.openstack_utils as os_utils
 
 class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
 
-    def __init__(self, project='functest', case_name='cloudify_ims',
-                 repo='', cmd=''):
-        super(CloudifyIms, self).__init__(project, case_name, repo, cmd)
+    def __init__(self, **kwargs):
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "cloudify_ims"
+        super(CloudifyIms, self).__init__(**kwargs)
         self.logger = ft_logger.Logger(__name__).getLogger()
 
         # Retrieve the configuration
diff --git a/functest/opnfv_tests/vnf/rnc/parser.py b/functest/opnfv_tests/vnf/rnc/parser.py
index fe4def1f..ff726b9e 100644
--- a/functest/opnfv_tests/vnf/rnc/parser.py
+++ b/functest/opnfv_tests/vnf/rnc/parser.py
@@ -19,8 +19,7 @@ import functest.core.feature as base
 
 
 class Parser(base.Feature):
-    def __init__(self, case_name='parser-basics'):
-        super(Parser, self).__init__(project='parser',
-                                     case_name=case_name,
-                                     repo='dir_repo_parser')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_parser'
+        super(Parser, self).__init__(**kwargs)
         self.cmd = 'cd %s/tests && ./functest_run.sh' % self.repo
diff --git a/functest/opnfv_tests/vnf/router/vyos_vrouter.py b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
index e188c3fb..e6d2284d 100644
--- a/functest/opnfv_tests/vnf/router/vyos_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
@@ -14,10 +14,11 @@ RESULT_DETAILS_FILE = "test_result.json"
 
 
 class VrouterVnf(base.Feature):
-    def __init__(self):
-        super(VrouterVnf, self).__init__(project='functest',
-                                         case='vyos_vrouter',
-                                         repo='dir_repo_vrouter')
+    def __init__(self, **kwargs):
+        kwargs["repo"] = 'dir_repo_vrouter'
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = "vyos_vrouter"
+        super(VrouterVnf, self).__init__(**kwargs)
         self.cmd = 'cd %s && ./run.sh' % self.repo
 
     def set_result_details(self):