Add patrole user and reader testing

The regexes will be updated in a second change (chicken and egg
between Functest and Releng)

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

diff --git a/ansible/site.yml b/ansible/site.yml
index f823f20..93d67fc 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -61,7 +61,9 @@
             - tempest_full
             - tempest_scenario
             - tempest_slow
-            - patrole
+            - patrole_admin
+            - patrole_member
+            - patrole_reader
             - tempest_barbican
             - tempest_octavia
         - container: functest-benchmarking

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 8bb5799..9eb46db 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -207,7 +207,7 @@ tiers:
                             - '--concurrency=1'
 
             -
-                case_name: patrole
+                case_name: patrole_admin
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -231,6 +231,56 @@ tiers:
                             - 'network.test_agents_rbac'
                             - 'test_list_metadef_namespaces'
 
+            -
+                case_name: patrole_user
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Patrole project.
+                run:
+                    name: patrole
+                    args:
+                        role: 'user'
+                        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'
+
+            -
+                case_name: patrole_reader
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Patrole project.
+                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'
+
             -
                 case_name: tempest_barbican
                 project_name: functest

diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 074efc5..a46f754 100644 (file)
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -47,7 +47,9 @@ The internal test cases are:
  * tempest_full
  * tempest_scenario
  * tempest_slow
- * patrole
+ * patrole_admin
+ * patrole_user
+ * patrole_reader
  * tempest_barbican
  * tempest_octavia
  * rally_full

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 3738ef6..97ad057 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -385,7 +385,7 @@ tiers:
                             - '--concurrency=1'
 
             -
-                case_name: patrole
+                case_name: patrole_admin
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -409,6 +409,56 @@ tiers:
                             - 'network.test_agents_rbac'
                             - 'test_list_metadef_namespaces'
 
+            -
+                case_name: patrole_user
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Patrole project.
+                run:
+                    name: patrole
+                    args:
+                        role: 'user'
+                        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'
+
+            -
+                case_name: patrole_reader
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Patrole project.
+                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'
+
             -
                 case_name: tempest_barbican
                 project_name: functest

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index 9bd877b..14f2b17 100644 (file)
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -26,7 +26,7 @@ class Patrole(tempest.TempestCommon):
         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'))
+        rconfig.set('rbac', 'rbac_test_roles', kwargs.get('role', 'admin'))
         with open(self.conf_file, 'w') as config_file:
             rconfig.write(config_file)
         self.backup_tempest_config(self.conf_file, self.res_dir)