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 211abb9..bdf18d3 100644 (file)
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -9,56 +9,20 @@
 
 # pylint: disable=missing-docstring
 
-import logging
-import os
-import time
+from six.moves import configparser
 
-from xtesting.core import testcase
-
-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 run(self, **kwargs):
-        self.start_time = time.time()
-        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', [])))
-        try:
-            self.configure()
-            self.configure_tempest_patrole(kwargs.get('role', 'admin'))
-            self.generate_test_list()
-            self.run_verifier_tests()
-            self.parse_verifier_result()
-            self.generate_report()
-            res = testcase.TestCase.EX_OK
-        except Exception:  # pylint: disable=broad-except
-            self.__logger.error('Error with run')
-            res = testcase.TestCase.EX_RUN_ERROR
-        finally:
-            self.resources.cleanup()
-        self.stop_time = time.time()
-        return res
-
-    def configure_tempest_patrole(self, role='admin'):
-        rconfig = conf_utils.ConfigParser.RawConfigParser()
+    def configure(self, **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', role)
-        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)