X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=functest%2Fopnfv_tests%2Fopenstack%2Fpatrole%2Fpatrole.py;h=bdf18d35e32d8f7932689d84d98ff86725e311bf;hb=61138bfec980625bec6c219b9e27685c281e5965;hp=14f2b17c50a18aad85dae58c357f2398e9089df1;hpb=3d92b386075690e34b398647499472f1adb407b5;p=functest.git

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 14f2b17c5..bdf18d35e 100644
--- 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_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)