9 files changed, 27 insertions, 36 deletions
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py
index 6207f5814..cd3062cc5 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 5b88a4995..e5c3f8bdb 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 fd181a040..3a2cc7dfa 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 1c620235c..629c8d54c 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 ada322c18..f7bab08be 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 f96683e36..d4f4eb67d 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 e3dc7fdf5..49eb8a08c 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 5e9254a0b..6a1071fff 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 e72563808..2ed9a823a 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 && '