Reduce Patrole extra logic

It also reduces the skipped test list taking into account Patrole
improvements.

Change-Id: I23a8c0610a8a4258aa806451f52796f3e7bc46ca
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

5 files changed, 49 insertions, 95 deletions

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 5fe6f2e5e..5e6a8d93d 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -216,20 +216,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'admin'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'admin'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: patrole_member
@@ -241,20 +234,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'member'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'member'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: patrole_reader
@@ -266,20 +252,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'reader'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'reader'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: tempest_barbican
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index d3195118d..43e86e3ed 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -394,20 +394,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'admin'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'admin'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: patrole_member
@@ -419,20 +412,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'member'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'member'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: patrole_reader
@@ -444,20 +430,13 @@ tiers:
                 run:
                     name: patrole
                     args:
-                        role: 'reader'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'network.test_flavors_rbac'
-                            - 'network.test_network_ip_availability_rbac'
-                            - 'test_networks_multiprovider_rbac'
-                            - 'test_auto_allocated_topology_rbac'
-                            - 'test_create_network_provider_segmentation_id'
-                            - 'test_update_network_provider_physical_network'
-                            - 'test_update_network_provider_segmentation_id'
-                            - 'network.test_agents_rbac'
-                            - 'test_list_metadef_namespaces'
+                        roles: 'reader'
+                        mode: "(?!.*test_unmanage_snapshot_rbac)\
+                          (?!.*test_delete_auto_allocated_topology)\
+                          (?=.*[.*\bslow\b.*])\
+                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                        option:
+                            - '--concurrency=4'
 
             -
                 case_name: tempest_barbican
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 14f2b17c5..8613d5127 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -24,17 +24,9 @@ class Patrole(tempest.TempestCommon):
         super(Patrole, self).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)
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 6a4d62f81..a444a54f5 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -96,3 +96,5 @@ heat_plugin:
     auth_version: 3
 heat_features_enabled:
     multi_cloud: false
+rbac:
+    enable_rbac: true
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index 5c5d5299d..141f295b4 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -96,3 +96,5 @@ heat_plugin:
     auth_version: 3
 heat_features_enabled:
     multi_cloud: false
+rbac:
+    enable_rbac: true