diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-03 15:22:50 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-03 15:28:12 +0200 |
| commit | 3d92b386075690e34b398647499472f1adb407b5 (patch) | |
| tree | b0a956da32ffdcb8cb0dfb1c0b76f9b60df47401 | |
| parent | 8ac784a6a6e6fd6a12b2fac8cec1469613f07721 (diff) | |
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>
| -rw-r--r-- | ansible/site.yml | 4 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 52 | ||||
| -rw-r--r-- | docs/release/release-notes/functest-release.rst | 4 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 52 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/patrole/patrole.py | 2 |
5 files changed, 109 insertions, 5 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index f823f2068..93d67fc4b 100644 --- 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 8bb57999a..9eb46db73 100644 --- 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 @@ -232,6 +232,56 @@ tiers: - '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 criteria: 100 diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index 074efc51a..a46f754c6 100644 --- 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 3738ef64f..97ad05787 100644 --- 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 @@ -410,6 +410,56 @@ tiers: - '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 criteria: 100 diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index 9bd877b60..14f2b17c5 100644 --- 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) |