summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <ollivier.cedric@gmail.com>2017-03-29 12:53:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-29 12:53:16 +0000
commit62661e25ab10f1fea79b8c1e19c6d493b3e12b68 (patch)
tree3d323e864d895b70844a77f89ebe081267fde94d
parentfe60c2fbe2b3f8d7c4c6cbf7e11dd97a9598fb7e (diff)
parentba4a83e7a825117da70e7cde81e6a1836a13e069 (diff)
Merge "rename FeatureBase to Feature"
-rw-r--r--functest/core/feature.py4
-rw-r--r--functest/opnfv_tests/features/barometer.py2
-rw-r--r--functest/opnfv_tests/features/copper.py2
-rw-r--r--functest/opnfv_tests/features/doctor.py2
-rw-r--r--functest/opnfv_tests/features/domino.py2
-rw-r--r--functest/opnfv_tests/features/netready.py2
-rw-r--r--functest/opnfv_tests/features/odl_sfc.py2
-rw-r--r--functest/opnfv_tests/features/promise.py2
-rw-r--r--functest/opnfv_tests/features/sdnvpn.py2
-rw-r--r--functest/opnfv_tests/features/security_scan.py2
-rw-r--r--functest/opnfv_tests/mano/orchestra.py2
-rw-r--r--functest/opnfv_tests/vnf/rnc/parser.py2
-rw-r--r--functest/opnfv_tests/vnf/router/vyos_vrouter.py2
13 files changed, 14 insertions, 14 deletions
diff --git a/functest/core/feature.py b/functest/core/feature.py
index f7f3e4605..325c10d49 100644
--- a/functest/core/feature.py
+++ b/functest/core/feature.py
@@ -6,10 +6,10 @@ import functest.utils.functest_logger as ft_logger
from functest.utils.constants import CONST
-class FeatureBase(base.TestCase):
+class Feature(base.TestCase):
def __init__(self, project='functest', case='', repo='', cmd=''):
- super(FeatureBase, self).__init__()
+ super(Feature, self).__init__()
self.project_name = project
self.case_name = case
self.cmd = cmd
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py
index fdcd38039..6011340f8 100644
--- a/functest/opnfv_tests/features/barometer.py
+++ b/functest/opnfv_tests/features/barometer.py
@@ -11,7 +11,7 @@ from baro_tests import collectd
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 9f6d8e16b..689341eab 100644
--- a/functest/opnfv_tests/features/copper.py
+++ b/functest/opnfv_tests/features/copper.py
@@ -17,7 +17,7 @@
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 8fb840681..d32bbfc99 100644
--- a/functest/opnfv_tests/features/doctor.py
+++ b/functest/opnfv_tests/features/doctor.py
@@ -16,7 +16,7 @@
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 9a4db737b..e34429bc2 100644
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -17,7 +17,7 @@
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 ab2c9da05..88f377c26 100644
--- a/functest/opnfv_tests/features/netready.py
+++ b/functest/opnfv_tests/features/netready.py
@@ -11,7 +11,7 @@
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 b26c2b581..fff7f2b0d 100644
--- a/functest/opnfv_tests/features/odl_sfc.py
+++ b/functest/opnfv_tests/features/odl_sfc.py
@@ -10,7 +10,7 @@
import functest.core.feature as base
-class OpenDaylightSFC(base.FeatureBase):
+class OpenDaylightSFC(base.Feature):
def __init__(self):
super(OpenDaylightSFC, self).__init__(project='sfc',
diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py
index bb270ac92..a7f4e6283 100644
--- a/functest/opnfv_tests/features/promise.py
+++ b/functest/opnfv_tests/features/promise.py
@@ -15,7 +15,7 @@
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 c375084aa..10e3146c8 100644
--- a/functest/opnfv_tests/features/sdnvpn.py
+++ b/functest/opnfv_tests/features/sdnvpn.py
@@ -10,7 +10,7 @@
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 ac36e7a3d..2374b39fe 100644
--- a/functest/opnfv_tests/features/security_scan.py
+++ b/functest/opnfv_tests/features/security_scan.py
@@ -12,7 +12,7 @@ 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',
diff --git a/functest/opnfv_tests/mano/orchestra.py b/functest/opnfv_tests/mano/orchestra.py
index a805b62b0..a9cf0ae66 100644
--- a/functest/opnfv_tests/mano/orchestra.py
+++ b/functest/opnfv_tests/mano/orchestra.py
@@ -15,7 +15,7 @@
import functest.core.feature as base
-class Orchestra(base.FeatureBase):
+class Orchestra(base.Feature):
def __init__(self):
super(Orchestra, self).__init__(project='orchestra',
case='orchestra',
diff --git a/functest/opnfv_tests/vnf/rnc/parser.py b/functest/opnfv_tests/vnf/rnc/parser.py
index 905d51e80..133145d74 100644
--- a/functest/opnfv_tests/vnf/rnc/parser.py
+++ b/functest/opnfv_tests/vnf/rnc/parser.py
@@ -18,7 +18,7 @@
import functest.core.feature as base
-class Parser(base.FeatureBase):
+class Parser(base.Feature):
def __init__(self):
super(Parser, self).__init__(project='parser',
case='parser-basics',
diff --git a/functest/opnfv_tests/vnf/router/vyos_vrouter.py b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
index 110c09b89..e188c3fbb 100644
--- a/functest/opnfv_tests/vnf/router/vyos_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
@@ -13,7 +13,7 @@ import os
RESULT_DETAILS_FILE = "test_result.json"
-class VrouterVnf(base.FeatureBase):
+class VrouterVnf(base.Feature):
def __init__(self):
super(VrouterVnf, self).__init__(project='functest',
case='vyos_vrouter',