Merge "Disable tempest server reboot test for SDNVPN and Gluon"

diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index 67890f0..43f0804 100644 (file)
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -157,12 +157,12 @@ In order to harmonize test integration, 3 abstraction classes have been
 introduced in Danube:
 
  * testcase: base for any test case
- * feature_base: abstraction for feature project
+ * feature: abstraction for feature project
  * vnf_base: abstraction for vnf onboarding
 
 The goal is to unify the way to run test from Functest.
 
-feature_base and vnf_base inherit from testcase::
+feature and vnf_base inherit from testcase::
 
               +-----------------------------------------+
               |                                         |
@@ -178,7 +178,7 @@ feature_base and vnf_base inherit from testcase::
                      V                       V
          +--------------------+   +--------------------------+
          |                    |   |                          |
-         |    feature_base    |   |      vnf_base            |
+         |    feature         |   |      vnf_base            |
          |                    |   |                          |
          |  - prepare()       |   |  - prepare()             |
          |  - execute()       |   |  - deploy_orchestrator() |

diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 8507c1a..e3485be 100644 (file)
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -405,7 +405,7 @@ follows::
         |   `-- setup.py
         |-- core
         |   |-- __init__.py
-        |   |-- feature_base.py
+        |   |-- feature.py
         |   |-- pytest_suite_runner.py
         |   |-- testcase.py
         |   |-- vnf_base.py

diff --git a/functest/core/feature_base.py b/functest/core/feature.py
similarity index 96%
rename from functest/core/feature_base.py
rename to functest/core/feature.py
index f7f3e46..325c10d 100644 (file)
--- a/functest/core/feature_base.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 3206728..6011340 100644 (file)
--- 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 735b315..689341e 100644 (file)
--- 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 4d295a6..d32bbfc 100644 (file)
--- 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 b36220f..e34429b 100644 (file)
--- 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 dec2a23..88f377c 100644 (file)
--- 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 1956c9c..fff7f2b 100644 (file)
--- a/functest/opnfv_tests/features/odl_sfc.py
+++ b/functest/opnfv_tests/features/odl_sfc.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 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 15636fb..a7f4e62 100644 (file)
--- 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 1919a03..10e3146 100644 (file)
--- 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 58f0ec7..2374b39 100644 (file)
--- 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',

diff --git a/functest/opnfv_tests/mano/orchestra.py b/functest/opnfv_tests/mano/orchestra.py
index fd5e40d..a9cf0ae 100644 (file)
--- a/functest/opnfv_tests/mano/orchestra.py
+++ b/functest/opnfv_tests/mano/orchestra.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 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 1cff722..133145d 100644 (file)
--- a/functest/opnfv_tests/vnf/rnc/parser.py
+++ b/functest/opnfv_tests/vnf/rnc/parser.py
@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-import functest.core.feature_base as base
+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 6c50e83..e188c3f 100644 (file)
--- a/functest/opnfv_tests/vnf/router/vyos_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
@@ -6,14 +6,14 @@
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
-import functest.core.feature_base as base
+import functest.core.feature as base
 import json
 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',