diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-07 14:02:08 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-07 20:30:28 +0100 |
commit | 0174b1962464c289d777caa88c91ff2c20be910a (patch) | |
tree | 475928cf8ab88d14112ef21498ce6ab59273daa1 /functest/opnfv_tests/openstack/patrole | |
parent | d2620ae72be08f83548be81fa80a418f2250da28 (diff) |
Allow overriding tempest output dir
Change-Id: I31a5d2772bab168b3cb4e6b0713d6e95aa5b6fd7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/patrole')
-rw-r--r-- | functest/opnfv_tests/openstack/patrole/patrole.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index 363784076..226f6812d 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -13,10 +13,12 @@ import logging import os import time +from xtesting.core import testcase + from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.opnfv_tests.openstack.tempest import conf_utils from functest.opnfv_tests.openstack.tempest import tempest -from xtesting.core import testcase +from functest.utils import config class Patrole(tempest.TempestCommon): @@ -28,12 +30,16 @@ class Patrole(tempest.TempestCommon): kwargs["case_name"] = 'patrole' super(Patrole, self).__init__(**kwargs) self.mode = "^patrole_tempest_plugin." + self.res_dir = os.path.join( + getattr(config.CONF, 'dir_results'), 'patrole') + 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 run(self, **kwargs): self.start_time = time.time() try: - if not os.path.exists(conf_utils.TEMPEST_RESULTS_DIR): - os.makedirs(conf_utils.TEMPEST_RESULTS_DIR) + if not os.path.exists(self.res_dir): + os.makedirs(self.res_dir) resources = self.resources.create() compute_cnt = snaps_utils.get_active_compute_cnt( self.resources.os_creds) @@ -42,7 +48,8 @@ class Patrole(tempest.TempestCommon): network_name=resources.get("network_name"), image_id=resources.get("image_id"), flavor_id=resources.get("flavor_id"), - compute_cnt=compute_cnt) + compute_cnt=compute_cnt, + role=kwargs.get('role', 'admin')) self.generate_test_list(self.verifier_repo_dir) self.apply_tempest_blacklist() self.run_verifier_tests() @@ -59,7 +66,7 @@ class Patrole(tempest.TempestCommon): def configure_tempest_patrole( self, deployment_dir, network_name=None, image_id=None, - flavor_id=None, compute_cnt=None): + flavor_id=None, compute_cnt=None, role='admin'): # pylint: disable=too-many-arguments """ Add/update needed parameters into tempest.conf file @@ -68,12 +75,13 @@ class Patrole(tempest.TempestCommon): "Updating selected tempest.conf parameters for Patrole") conf_file = conf_utils.configure_verifier(deployment_dir) conf_utils.configure_tempest_update_params( - conf_file, network_name, image_id, flavor_id, compute_cnt) - config = conf_utils.ConfigParser.RawConfigParser() - config.read(conf_file) - config.set('identity-feature-enabled', 'api_v2', False) - config.add_section('rbac') - config.set('rbac', 'enable_rbac', True) - config.set('rbac', 'rbac_test_role', 'admin') + conf_file, self.res_dir, network_name, image_id, flavor_id, + compute_cnt) + rconfig = conf_utils.ConfigParser.RawConfigParser() + rconfig.read(conf_file) + rconfig.set('identity-feature-enabled', 'api_v2', False) + rconfig.add_section('rbac') + rconfig.set('rbac', 'enable_rbac', True) + rconfig.set('rbac', 'rbac_test_role', role) with open(conf_file, 'wb') as config_file: - config.write(config_file) + rconfig.write(config_file) |