From 205f8ff34140d816b8c9a66d15d73c5207f8cb8e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 16 Mar 2018 22:38:55 +0100 Subject: Set api_extensions = all for NeutronTrunk only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c019094a9cea86f5990752463a3690d4f00df0c Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 2 -- functest/opnfv_tests/openstack/tempest/tempest.py | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index d6b1eb401..0ff68f292 100644 --- 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 8d47ddb75..b3d091e57 100644 --- 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.""" -- cgit 1.2.3-korg