Update to Alpine 3.14

[functest.git] / functest / opnfv_tests / openstack / patrole / patrole.py

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 45378b6..bdf18d3 100644 (file)
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -9,8 +9,6 @@
 
 # pylint: disable=missing-docstring
 
-import logging
-
 from six.moves import configparser
 
 from functest.opnfv_tests.openstack.tempest import tempest
@@ -18,23 +16,13 @@ from functest.opnfv_tests.openstack.tempest import tempest
 
 class Patrole(tempest.TempestCommon):
 
-    __logger = logging.getLogger(__name__)
-
     def configure(self, **kwargs):
-        super(Patrole, self).configure(**kwargs)
+        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') 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)