X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fpatrole%2Fpatrole.py;h=9bd877b60fed44938575c2425744c7082e8553d2;hb=2a0702ea914a574ffa7c6d6f83a5c606e24ebd0a;hp=c4ed808376c1756e2fa806dcdf47c275a563080c;hpb=09d6e6feef33fa47bca440a096894b851b1ebca5;p=functest.git

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index c4ed80837..9bd877b60 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -10,29 +10,16 @@
 # pylint: disable=missing-docstring
 
 import logging
-import os
 
 from six.moves import configparser
 
 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 = configparser.RawConfigParser()
@@ -40,18 +27,14 @@ class Patrole(tempest.TempestCommon):
         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:
+        with open(self.conf_file, 'w') 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', [])))
+        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)