Merge "Add tests to cover flavors"
diff --git a/patrole_tempest_plugin/tests/api/network/test_auto_allocated_topology_rbac.py b/patrole_tempest_plugin/tests/api/network/test_auto_allocated_topology_rbac.py
new file mode 100644
index 0000000..bcf62d7
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/network/test_auto_allocated_topology_rbac.py
@@ -0,0 +1,44 @@
+# Copyright 2018 AT&T Corporation.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from tempest.common import utils
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.tests.api.network import rbac_base as base
+
+
+class AutoAllocationTopologyPluginRbacTest(base.BaseNetworkPluginRbacTest):
+
+ @classmethod
+ def skip_checks(cls):
+ super(AutoAllocationTopologyPluginRbacTest, cls).skip_checks()
+ if not utils.is_extension_enabled('auto-allocated-topology',
+ 'network'):
+ msg = "auto-allocated-topology extension not enabled."
+ raise cls.skipException(msg)
+
+ @decorators.idempotent_id('299CB831-F6B2-49CA-882B-E9A8E36945A2')
+ @rbac_rule_validation.action(service="neutron",
+ rules=["get_auto_allocated_topology"],
+ expected_error_codes=[404])
+ def test_show_auto_allocated_topology(self):
+ """Show auto_allocated_topology.
+
+ RBAC test for the neutron "get_auto_allocated_topology" policy
+ """
+ with self.rbac_utils.override_role(self):
+ self.ntp_client.get_auto_allocated_topology(
+ tenant_id=self.os_primary.credentials.tenant_id)
diff --git a/patrole_tempest_plugin/tests/api/network/test_segments_rbac.py b/patrole_tempest_plugin/tests/api/network/test_segments_rbac.py
index 2db674b..9725e2b 100644
--- a/patrole_tempest_plugin/tests/api/network/test_segments_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_segments_rbac.py
@@ -78,7 +78,8 @@
@decorators.idempotent_id('c02618e7-bb20-1a3a-83c8-6eec2af08127')
@rbac_rule_validation.action(service="neutron",
- rules=["get_segment"])
+ rules=["get_segment"],
+ expected_error_codes=[404])
def test_show_segment(self):
"""Show segment.
@@ -92,7 +93,8 @@
@decorators.idempotent_id('c02618e7-bb20-1a3a-83c8-6eec2af08128')
@rbac_rule_validation.action(service="neutron",
rules=["get_segment",
- "update_segment"])
+ "update_segment"],
+ expected_error_codes=[404, 403])
def test_update_segment(self):
"""Update segment.
@@ -107,7 +109,8 @@
@decorators.idempotent_id('c02618e7-bb20-1a3a-83c8-6eec2af08129')
@rbac_rule_validation.action(service="neutron",
rules=["get_segment",
- "delete_segment"])
+ "delete_segment"],
+ expected_error_codes=[404, 403])
def test_delete_segment(self):
"""Delete segment.
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
index 61532c6..a6ded52 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_basic_crud_rbac.py
@@ -13,12 +13,16 @@
# License for the specific language governing permissions and limitations
# under the License.
+from tempest.common import waiters
+from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from patrole_tempest_plugin import rbac_rule_validation
from patrole_tempest_plugin.tests.api.volume import rbac_base
+CONF = config.CONF
+
class VolumesBasicCrudV3RbacTest(rbac_base.BaseVolumeRbacTest):
@@ -31,8 +35,15 @@
rule="volume:create")
@decorators.idempotent_id('426b08ef-6394-4d06-9128-965d5a6c38ef')
def test_create_volume(self):
+ name = data_utils.rand_name(self.__class__.__name__ + '-Volume')
+ size = CONF.volume.volume_size
+
with self.rbac_utils.override_role(self):
- self.create_volume()
+ volume = self.volumes_client.create_volume(name=name, size=size)[
+ 'volume']
+ self.addCleanup(self.delete_volume, self.volumes_client, volume['id'])
+ waiters.wait_for_volume_resource_status(self.volumes_client,
+ volume['id'], 'available')
@rbac_rule_validation.action(service="cinder",
rule="volume:delete")
@@ -41,20 +52,28 @@
volume = self.create_volume()
with self.rbac_utils.override_role(self):
self.volumes_client.delete_volume(volume['id'])
+ self.volumes_client.wait_for_resource_deletion(volume['id'])
@rbac_rule_validation.action(service="cinder", rule="volume:get")
@decorators.idempotent_id('c4c3fdd5-b1b1-49c3-b977-a9f40ee9257a')
- def test_get_volume(self):
+ def test_show_volume(self):
with self.rbac_utils.override_role(self):
self.volumes_client.show_volume(self.volume['id'])
@rbac_rule_validation.action(service="cinder",
rule="volume:get_all")
@decorators.idempotent_id('e3ab7906-b04b-4c45-aa11-1104d302f940')
- def test_volume_list(self):
+ def test_list_volumes(self):
with self.rbac_utils.override_role(self):
self.volumes_client.list_volumes()
+ @decorators.idempotent_id('9b6d5beb-254f-4f1b-9906-0bdce4042f53')
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:get_all")
+ def test_list_volumes_with_details(self):
+ with self.rbac_utils.override_role(self):
+ self.volumes_client.list_volumes(detail=True)
+
@rbac_rule_validation.action(service="cinder", rule="volume:update")
@decorators.idempotent_id('b751b889-9a9b-40d8-ae7d-4b0f65e71ac7')
def test_update_volume(self):