aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/patrole/patrole.py
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/openstack/patrole/patrole.py')
-rw-r--r--functest/opnfv_tests/openstack/patrole/patrole.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 14f2b17c5..8613d5127 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -24,17 +24,9 @@ class Patrole(tempest.TempestCommon):
super(Patrole, self).configure(**kwargs)
rconfig = configparser.RawConfigParser()
rconfig.read(self.conf_file)
- rconfig.add_section('rbac')
- rconfig.set('rbac', 'enable_rbac', True)
- rconfig.set('rbac', 'rbac_test_roles', kwargs.get('role', 'admin'))
+ if not rconfig.has_section('rbac'):
+ rconfig.add_section('rbac')
+ rconfig.set('rbac', 'rbac_test_roles', kwargs.get('roles', 'admin'))
with open(self.conf_file, 'w') as config_file:
rconfig.write(config_file)
self.backup_tempest_config(self.conf_file, self.res_dir)
-
- def run(self, **kwargs):
- for exclude in kwargs.get('excludes', []):
- kwargs['mode'] = "{}(?!.*{})".format(
- kwargs.get('mode', ''), exclude)
- kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format(
- kwargs['mode'], '|'.join(kwargs.get('includes', [])))
- return super(Patrole, self).run(**kwargs)