Set api_extensions = all for NeutronTrunk only

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

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index d6b1eb4..0ff68f2 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -231,8 +231,6 @@ def configure_tempest_update_params(tempest_conf_file, res_dir,
         rconfig.set('identity', 'v3_endpoint_type',
                     os.environ.get('OS_ENDPOINT_TYPE'))
 
-    rconfig.set('network-feature-enabled', 'api_extensions', 'all')
-
     if os.environ.get('OS_ENDPOINT_TYPE') is not None:
         sections = rconfig.sections()
         services_list = [

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 8d47ddb..b3d091e 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -248,7 +248,7 @@ class TempestCommon(testcase.TestCase):
         subprocess.Popen(cmd, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
 
-    def configure(self):
+    def configure(self, **kwargs):  # pylint: disable=unused-argument
         """
         Create all openstack resources for tempest-based testcases and write
         tempest.conf.
@@ -307,6 +307,14 @@ class TempestNeutronTrunk(TempestCommon):
         self.raw_list = os.path.join(self.res_dir, 'test_raw_list.txt')
         self.list = os.path.join(self.res_dir, 'test_list.txt')
 
+    def configure(self, **kwargs):
+        super(TempestNeutronTrunk, self).configure(**kwargs)
+        rconfig = conf_utils.ConfigParser.RawConfigParser()
+        rconfig.read(self.conf_file)
+        rconfig.set('network-feature-enabled', 'api_extensions', 'all')
+        with open(self.conf_file, 'wb') as config_file:
+            rconfig.write(config_file)
+
 
 class TempestSmokeParallel(TempestCommon):
     """Tempest smoke parallel testcase implementation."""