9 files changed, 20 insertions, 22 deletions
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py
index 32067284..6011340f 100644
--- a/functest/opnfv_tests/features/barometer.py
+++ b/functest/opnfv_tests/features/barometer.py
@@ -8,10 +8,10 @@
 
 from baro_tests import collectd
 
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class BarometerCollectd(base.FeatureBase):
+class BarometerCollectd(base.Feature):
     '''
     Class for executing barometercollectd testcase.
     '''
diff --git a/functest/opnfv_tests/features/copper.py b/functest/opnfv_tests/features/copper.py
index 735b315d..689341ea 100644
--- a/functest/opnfv_tests/features/copper.py
+++ b/functest/opnfv_tests/features/copper.py
@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class Copper(base.FeatureBase):
+class Copper(base.Feature):
     def __init__(self):
         super(Copper, self).__init__(project='copper',
                                      case='copper-notification',
diff --git a/functest/opnfv_tests/features/doctor.py b/functest/opnfv_tests/features/doctor.py
index 4d295a67..d32bbfc9 100644
--- a/functest/opnfv_tests/features/doctor.py
+++ b/functest/opnfv_tests/features/doctor.py
@@ -13,10 +13,10 @@
 # 0.2: measure test duration and publish results under json format
 #
 #
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class Doctor(base.FeatureBase):
+class Doctor(base.Feature):
     def __init__(self):
         super(Doctor, self).__init__(project='doctor',
                                      case='doctor-notification',
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
index b36220fa..e34429bc 100644
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -14,10 +14,10 @@
 # 0.3: add report flag to push results when needed
 # 0.4: refactoring to match Test abstraction class
 
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class Domino(base.FeatureBase):
+class Domino(base.Feature):
     def __init__(self):
         super(Domino, self).__init__(project='domino',
                                      case='domino-multinode',
diff --git a/functest/opnfv_tests/features/netready.py b/functest/opnfv_tests/features/netready.py
index dec2a23c..88f377c2 100644
--- a/functest/opnfv_tests/features/netready.py
+++ b/functest/opnfv_tests/features/netready.py
@@ -8,10 +8,10 @@
 #
 
 #
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class GluonVping(base.FeatureBase):
+class GluonVping(base.Feature):
 
     def __init__(self):
         super(GluonVping, self).__init__(project='netready',
diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py
index 431cd47e..fff7f2b0 100644
--- a/functest/opnfv_tests/features/odl_sfc.py
+++ b/functest/opnfv_tests/features/odl_sfc.py
@@ -7,16 +7,14 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-import functest.core.feature_base as base
-from sfc.tests.functest import run_tests
+import functest.core.feature as base
 
 
-class OpenDaylightSFC(base.FeatureBase):
+class OpenDaylightSFC(base.Feature):
 
     def __init__(self):
         super(OpenDaylightSFC, self).__init__(project='sfc',
                                               case='functest-odl-sfc',
                                               repo='dir_repo_sfc')
-
-    def execute(self):
-        return run_tests.main()
+        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 15636fbf..a7f4e628 100644
--- a/functest/opnfv_tests/features/promise.py
+++ b/functest/opnfv_tests/features/promise.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class Promise(base.FeatureBase):
+class Promise(base.Feature):
     def __init__(self):
         super(Promise, self).__init__(project='promise',
                                       case='promise',
diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py
index 1919a03c..10e3146c 100644
--- a/functest/opnfv_tests/features/sdnvpn.py
+++ b/functest/opnfv_tests/features/sdnvpn.py
@@ -7,10 +7,10 @@
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-import functest.core.feature_base as base
+import functest.core.feature as base
 
 
-class SdnVpnTests(base.FeatureBase):
+class SdnVpnTests(base.Feature):
 
     def __init__(self):
         super(SdnVpnTests, self).__init__(project='sdnvpn',
diff --git a/functest/opnfv_tests/features/security_scan.py b/functest/opnfv_tests/features/security_scan.py
index 58f0ec74..2374b39f 100644
--- a/functest/opnfv_tests/features/security_scan.py
+++ b/functest/opnfv_tests/features/security_scan.py
@@ -8,11 +8,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-import functest.core.feature_base as base
+import functest.core.feature as base
 from functest.utils.constants import CONST
 
 
-class SecurityScan(base.FeatureBase):
+class SecurityScan(base.Feature):
     def __init__(self):
         super(SecurityScan, self).__init__(project='securityscanning',
                                            case='security_scan',