diff options
Diffstat (limited to 'functest/opnfv_tests/openstack/patrole/patrole.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/patrole/patrole.py | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index 0c5eedf48..88c42f269 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -9,48 +9,20 @@ # pylint: disable=missing-docstring -import logging -import os +from six.moves import configparser -from functest.opnfv_tests.openstack.tempest import conf_utils from functest.opnfv_tests.openstack.tempest import tempest -from functest.utils import config class Patrole(tempest.TempestCommon): - __logger = logging.getLogger(__name__) - - def __init__(self, **kwargs): - if "case_name" not in kwargs: - kwargs["case_name"] = 'patrole' - super(Patrole, self).__init__(**kwargs) - self.res_dir = os.path.join( - getattr(config.CONF, 'dir_results'), 'patrole') - self.list = os.path.join(self.res_dir, 'tempest-list.txt') - - def apply_tempest_blacklist(self): - pass - def configure(self, **kwargs): - super(Patrole, self).configure(**kwargs) - rconfig = conf_utils.ConfigParser.RawConfigParser() + super().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_role', kwargs.get('role', 'admin')) - with open(self.conf_file, 'wb') as config_file: + 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', encoding='utf-8') as config_file: rconfig.write(config_file) self.backup_tempest_config(self.conf_file, self.res_dir) - - def generate_test_list(self): - self.backup_tempest_config(self.conf_file, '/etc') - super(Patrole, self).generate_test_list() - os.remove('/etc/tempest.conf') - - def run(self, **kwargs): - for exclude in kwargs.get('exclude', []): - self.mode = "{}(?!.*{})".format(self.mode, exclude) - self.mode = "'{}(?=patrole_tempest_plugin.tests.api.({}))'".format( - self.mode, '|'.join(kwargs.get('services', []))) - return super(Patrole, self).run(**kwargs) |