Merge "Glance tests - Image Metadef Namespace and Namespace Objects"
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index b0a6f33..00cc57b 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -25,7 +25,7 @@
tempest.conf
++++++++++++
-To run the RBAC tempest api test you have to make the following changes to
+To run the RBAC tempest api test, you have to make the following changes to
the tempest.conf file.
#. [auth] section updates ::
@@ -49,11 +49,8 @@
# The role that you want the RBAC tests to use for RBAC testing
# This needs to be edited to run the test as a different role.
- rbac_test_role=_member_
+ rbac_test_role = _member_
- # The list of roles that your system contains.
- # This needs to be updated as new roles are added.
- rbac_roles=admin,_member_
-
- # Tell standard RBAC test cases to run other wise it they are skipped.
- rbac_flag=true
+ # Enables RBAC Tempest tests if set to True. Otherwise, they are
+ # skipped.
+ rbac_flag = True
diff --git a/patrole_tempest_plugin/config.py b/patrole_tempest_plugin/config.py
index 2b20391..6ee1528 100644
--- a/patrole_tempest_plugin/config.py
+++ b/patrole_tempest_plugin/config.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 AT&T inc.
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -26,8 +26,4 @@
cfg.BoolOpt('rbac_flag',
default=False,
help="Enables RBAC tests."),
- cfg.ListOpt('rbac_roles',
- default=['admin'],
- help="List of RBAC roles found in the policy files "
- "under testing."),
]
diff --git a/patrole_tempest_plugin/plugin.py b/patrole_tempest_plugin/plugin.py
index 1bc4d04..3abf4aa 100644
--- a/patrole_tempest_plugin/plugin.py
+++ b/patrole_tempest_plugin/plugin.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 AT&T inc.
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/rbac_auth.py b/patrole_tempest_plugin/rbac_auth.py
index 78cc951..1afc7ae 100644
--- a/patrole_tempest_plugin/rbac_auth.py
+++ b/patrole_tempest_plugin/rbac_auth.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/rbac_exceptions.py b/patrole_tempest_plugin/rbac_exceptions.py
index 94e6bdd..c6165ff 100644
--- a/patrole_tempest_plugin/rbac_exceptions.py
+++ b/patrole_tempest_plugin/rbac_exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/rbac_role_converter.py b/patrole_tempest_plugin/rbac_role_converter.py
index 65e3f27..420de7f 100644
--- a/patrole_tempest_plugin/rbac_role_converter.py
+++ b/patrole_tempest_plugin/rbac_role_converter.py
@@ -1,4 +1,4 @@
-# Copyright 2016 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/rbac_rule_validation.py b/patrole_tempest_plugin/rbac_rule_validation.py
index 7f9d4d2..4b85187 100644
--- a/patrole_tempest_plugin/rbac_rule_validation.py
+++ b/patrole_tempest_plugin/rbac_rule_validation.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -28,8 +28,14 @@
def action(service, rule):
def decorator(func):
def wrapper(*args, **kwargs):
- authority = rbac_auth.RbacAuthority(
- args[0].auth_provider.credentials.tenant_id, service)
+ try:
+ tenant_id = args[0].auth_provider.credentials.tenant_id
+ except (IndexError, AttributeError) as e:
+ msg = ("{0}: tenant_id not found in "
+ "cls.auth_provider.credentials".format(e))
+ LOG.error(msg)
+ raise rbac_exceptions.RbacResourceSetupFailed(msg)
+ authority = rbac_auth.RbacAuthority(tenant_id, service)
allowed = authority.get_permission(rule, CONF.rbac.rbac_test_role)
try:
diff --git a/patrole_tempest_plugin/rbac_utils.py b/patrole_tempest_plugin/rbac_utils.py
index 1150416..48d5b4c 100644
--- a/patrole_tempest_plugin/rbac_utils.py
+++ b/patrole_tempest_plugin/rbac_utils.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/compute/__init__.py b/patrole_tempest_plugin/tests/api/compute/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/__init__.py
diff --git a/patrole_tempest_plugin/tests/api/compute/rbac_base.py b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
new file mode 100644
index 0000000..030ee5c
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
@@ -0,0 +1,38 @@
+# Copyright 2017 AT&T Corporation
+# 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.api.compute import base as compute_base
+from tempest import config
+
+CONF = config.CONF
+
+
+class BaseV2ComputeRbacTest(compute_base.BaseV2ComputeTest):
+
+ credentials = ['primary', 'admin']
+
+ @classmethod
+ def skip_checks(cls):
+ super(BaseV2ComputeRbacTest, cls).skip_checks()
+ if not CONF.rbac.rbac_flag:
+ raise cls.skipException(
+ '%s skipped as RBAC flag not enabled' % cls.__name__)
+ if 'admin' not in CONF.auth.tempest_roles:
+ raise cls.skipException(
+ "%s skipped because tempest roles is not admin" % cls.__name__)
+
+ @classmethod
+ def setup_clients(cls):
+ super(BaseV2ComputeRbacTest, cls).setup_clients()
+ cls.admin_client = cls.os_admin.agents_client
+ cls.auth_provider = cls.os.auth_provider
diff --git a/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py
new file mode 100644
index 0000000..3da3bd8
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py
@@ -0,0 +1,47 @@
+# Copyright 2017 AT&T Corporation
+# 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 patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.compute import rbac_base
+from tempest import config
+from tempest.lib import decorators
+
+CONF = config.CONF
+
+
+class RBACAbsoluteLimitsTestJSON(rbac_base.BaseV2ComputeRbacTest):
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(RBACAbsoluteLimitsTestJSON, self).tearDown()
+
+ @classmethod
+ def setup_clients(cls):
+ super(RBACAbsoluteLimitsTestJSON, cls).setup_clients()
+ cls.identity_client = cls.os_adm.identity_client
+ cls.tenants_client = cls.os_adm.tenants_client
+
+ @classmethod
+ def skip_checks(cls):
+ super(RBACAbsoluteLimitsTestJSON, cls).skip_checks()
+ if not CONF.compute_feature_enabled.api_extensions:
+ raise cls.skipException(
+ '%s skipped as no compute extensions enabled' % cls.__name__)
+
+ @rbac_rule_validation.action(service="nova",
+ rule="os_compute_api:os-used-limits")
+ @decorators.idempotent_id('3fb60f83-9a5f-4fdd-89d9-26c3710844a1')
+ def test_used_limits_for_admin_rbac(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.limits_client.show_limits()
diff --git a/patrole_tempest_plugin/tests/api/image/rbac_base.py b/patrole_tempest_plugin/tests/api/image/rbac_base.py
index 786927f..5a9731a 100644
--- a/patrole_tempest_plugin/tests/api/image/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/image/rbac_base.py
@@ -1,4 +1,4 @@
-# Copyright 2017 at&t
+# Copyright 2017 AT&T Corporation.
# 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
@@ -18,6 +18,27 @@
CONF = config.CONF
+class BaseV1ImageRbacTest(image_base.BaseV1ImageTest):
+
+ credentials = ['primary', 'admin']
+
+ @classmethod
+ def skip_checks(cls):
+ super(BaseV1ImageRbacTest, cls).skip_checks()
+ if not CONF.rbac.rbac_flag:
+ raise cls.skipException(
+ "%s skipped as RBAC Flag not enabled" % cls.__name__)
+ if 'admin' not in CONF.auth.tempest_roles:
+ raise cls.skipException(
+ "%s skipped because tempest roles is not admin" % cls.__name__)
+
+ @classmethod
+ def setup_clients(cls):
+ super(BaseV1ImageRbacTest, cls).setup_clients()
+ cls.auth_provider = cls.os.auth_provider
+ cls.admin_client = cls.os_adm.image_client
+
+
class BaseV2ImageRbacTest(image_base.BaseV2ImageTest):
credentials = ['primary', 'admin']
diff --git a/patrole_tempest_plugin/tests/api/image/v1/__init__.py b/patrole_tempest_plugin/tests/api/image/v1/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/image/v1/__init__.py
diff --git a/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
new file mode 100644
index 0000000..97c218a
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/image/v1/test_images_member_rbac.py
@@ -0,0 +1,85 @@
+# Copyright 2017 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 import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.image import rbac_base as base
+
+CONF = config.CONF
+
+
+class ImagesMemberRbacTest(base.BaseV1ImageRbacTest):
+
+ credentials = ['primary', 'alt', 'admin']
+
+ @classmethod
+ def setup_clients(cls):
+ super(ImagesMemberRbacTest, cls).setup_clients()
+ cls.image_member_client = cls.os.image_member_client
+ cls.alt_image_member_client = cls.os_alt.image_member_client
+
+ @classmethod
+ def resource_setup(cls):
+ super(ImagesMemberRbacTest, cls).resource_setup()
+ cls.alt_tenant_id = cls.alt_image_member_client.tenant_id
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(ImagesMemberRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(service="glance", rule="add_member")
+ @decorators.idempotent_id('bda2bb78-e6ec-4b87-ba6d-1eaf1b28fa8b')
+ def test_add_image_member(self):
+ """Add image member
+
+ RBAC test for the glance add_member policy
+ """
+ image = self.create_image()
+ # Toggle role and add image member
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.image_member_client.create_image_member(image['id'],
+ self.alt_tenant_id)
+
+ @rbac_rule_validation.action(service="glance", rule="delete_member")
+ @decorators.idempotent_id('9beaf28c-62b7-4c30-bbe5-4283aed1201c')
+ def test_delete_image_member(self):
+ """Delete image member
+
+ RBAC test for the glance delete_member policy
+ """
+ image = self.create_image()
+ self.image_member_client.create_image_member(image['id'],
+ self.alt_tenant_id)
+ # Toggle role and delete image member
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.image_member_client.delete_image_member(image['id'],
+ self.alt_tenant_id)
+
+ @rbac_rule_validation.action(service="glance", rule="get_members")
+ @decorators.idempotent_id('a0fcd855-31ef-458c-97e0-14a448cdd6da')
+ def test_list_image_members(self):
+ """List image members
+
+ RBAC test for the glance get_members policy
+ """
+ image = self.create_image()
+ self.image_member_client.create_image_member(image['id'],
+ self.alt_tenant_id)
+ # Toggle role and delete image member
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.image_member_client.list_image_members(image['id'])
diff --git a/patrole_tempest_plugin/tests/api/image/v1/test_images_rbac.py b/patrole_tempest_plugin/tests/api/image/v1/test_images_rbac.py
new file mode 100644
index 0000000..ee6a2eb
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/image/v1/test_images_rbac.py
@@ -0,0 +1,156 @@
+# Copyright 2017 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 six import moves
+
+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.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.image import rbac_base
+
+CONF = config.CONF
+
+
+class BasicOperationsImagesRbacTest(rbac_base.BaseV1ImageRbacTest):
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(BasicOperationsImagesRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(service="glance", rule="add_image")
+ @decorators.idempotent_id('33248a04-6527-11e6-be0f-080027d0d606')
+ def test_create_image(self):
+ """Create Image Test
+
+ RBAC test for the glance add_image policy.
+ """
+ properties = {'prop1': 'val1'}
+ image_name = data_utils.rand_name('image')
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=False,
+ properties=properties)
+
+ @rbac_rule_validation.action(service="glance", rule="delete_image")
+ @decorators.idempotent_id('731c8c81-6c63-413b-a61a-050ce9ca16ad')
+ def test_delete_image(self):
+ """Delete Image Test
+
+ RBAC test for the glance delete_image policy.
+ """
+ image_name = data_utils.rand_name('image')
+ properties = {'prop1': 'val1'}
+ body = self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=False,
+ properties=properties)
+ image_id = body['id']
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.delete_image(image_id)
+
+ @rbac_rule_validation.action(service="glance", rule="download_image")
+ @decorators.idempotent_id('a22bf112-5a3a-419e-9cd6-9562d1a3a458')
+ def test_download_image(self):
+ """Download Image Test
+
+ RBAC test for the glance download_image policy.
+ """
+ image_name = data_utils.rand_name('image')
+ properties = {'prop1': 'val1'}
+ body = self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=False,
+ properties=properties)
+ image_id = body['id']
+ # Now try uploading an image file
+ image_file = moves.cStringIO(data_utils.random_bytes())
+ self.client.update_image(image_id, data=image_file)
+ # Toggle role and get created image
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.show_image(image_id)
+
+ @rbac_rule_validation.action(service="glance", rule="get_image")
+ @decorators.idempotent_id('110257aa-6fa3-4cc0-b8dd-d93d43acd45c')
+ def test_get_image(self):
+ """Get Image Test
+
+ RBAC test for the glance get_image policy.
+ """
+ image_name = data_utils.rand_name('image')
+ properties = {'prop1': 'val1'}
+ body = self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=False,
+ properties=properties)
+ image_id = body['id']
+ # Now try uploading an image file
+ image_file = moves.cStringIO(data_utils.random_bytes())
+ self.client.update_image(image_id, data=image_file)
+ # Toggle role and get created image
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.check_image(image_id)
+
+ @rbac_rule_validation.action(service="glance", rule="get_images")
+ @decorators.idempotent_id('37662238-0fe9-4dff-8d90-e02f31e7e3fb')
+ def test_list_images(self):
+ """Get Image Test
+
+ RBAC test for the glance get_images policy.
+ """
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.list_images()
+
+ @rbac_rule_validation.action(service="glance", rule="modify_image")
+ @decorators.idempotent_id('3a391a19-d756-4c96-a346-72cc02f6106e')
+ def test_update_image(self):
+ """Update Image Test
+
+ RBAC test for the glance modify_image policy.
+ """
+ image_name = data_utils.rand_name('image')
+ properties = {'prop1': 'val1'}
+ body = self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=False,
+ properties=properties)
+ image_id = body.get('id')
+ properties = {'prop1': 'val2'}
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.update_image(image_id, headers=properties)
+
+ @rbac_rule_validation.action(service="glance", rule="publicize_image")
+ @decorators.idempotent_id('d5b1d09f-ba47-4d56-913e-4f38733a9a5c')
+ def test_publicize_image(self):
+ """Publicize Image Test
+
+ RBAC test for the glance publicize_image policy.
+ """
+ image_name = data_utils.rand_name('image')
+ properties = {'prop1': 'val1'}
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.create_image(name=image_name,
+ container_format='bare',
+ disk_format='raw',
+ is_public=True,
+ properties=properties)
diff --git a/patrole_tempest_plugin/tests/api/image/v2/__init__.py b/patrole_tempest_plugin/tests/api/image/v2/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/image/v2/__init__.py
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
index bcfeea7..d6a6d62 100644
--- a/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v2/test_images_member_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 ATT Corporation.
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py b/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
index 39b4cd9..5e20612 100644
--- a/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
+++ b/patrole_tempest_plugin/tests/api/image/v2/test_images_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 ATT Corporation.
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/network/rbac_base.py b/patrole_tempest_plugin/tests/api/network/rbac_base.py
index 3bbe8b6..18a80a1 100644
--- a/patrole_tempest_plugin/tests/api/network/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/network/rbac_base.py
@@ -1,4 +1,6 @@
-# Copyright 2017 at&t
+# Copyright 2017 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
diff --git a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
index 77d042d..eb5c42a 100644
--- a/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_networks_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py b/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py
new file mode 100644
index 0000000..197cbf6
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/admin/test_qos_rbac.py
@@ -0,0 +1,163 @@
+# Copyright 2017 AT&T Corp
+# 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 waiters
+from tempest import config
+from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class VolumeQOSRbacTest(rbac_base.BaseVolumeAdminRbacTest):
+ @classmethod
+ def setup_clients(cls):
+ super(VolumeQOSRbacTest, cls).setup_clients()
+ cls.admin_client = cls.os_adm.volume_qos_client
+ cls.auth_provider = cls.os.auth_provider
+ cls.client = cls.admin_volume_qos_client
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(VolumeQOSRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:create")
+ @decorators.idempotent_id('4f9f45f0-b379-4577-a279-cec3e917cbec')
+ def test_create_qos_with_consumer(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # Create a qos
+ self.create_test_qos_specs()
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:delete")
+ @decorators.idempotent_id('fbc8a77e-6b6d-45ae-bebe-c496eb8f06f7')
+ def test_delete_qos_with_consumer(self):
+ # Create a qos
+ qos = self.create_test_qos_specs()
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # Delete a qos
+ self.client.delete_qos(qos['id'])
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume_extension:qos_specs_manage:read")
+ @decorators.idempotent_id('22aff0dd-0343-408d-ae80-e77551956e14')
+ def test_get_qos(self):
+ # Create a qos
+ qos = self.create_test_qos_specs()
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # Get a qos
+ self.client.show_qos(qos['id'])['qos_specs']
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume_extension:qos_specs_manage:read")
+ @decorators.idempotent_id('546b8bb1-04a4-4387-9506-a538a7f3cd6a')
+ def test_list_qos(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # list all qos
+ self.client.list_qos()['qos_specs']
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:update")
+ @decorators.idempotent_id('89b630b7-c170-47c3-ac80-50ed425c2d98')
+ def test_set_qos_key(self):
+ # Create a qos
+ qos = self.create_test_qos_specs()
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # set key
+ self.client.set_qos_key(qos['id'], iops_bytes='500')['qos_specs']
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:update")
+ @decorators.idempotent_id('6c50c837-de77-4dae-a2ec-30e05c62969c')
+ def test_unset_qos_key(self):
+ # Create a qos
+ qos = self.create_test_qos_specs()
+ # Set key
+ self.client.set_qos_key(qos['id'], iops_bytes='500')['qos_specs']
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # Unset key
+ keys = ['iops_bytes']
+ self.client.unset_qos_key(qos['id'], keys)
+ operation = 'qos-key-unset'
+ waiters.wait_for_qos_operations(self.client, qos['id'],
+ operation, args=keys)
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:update")
+ @decorators.idempotent_id('2047b347-8bbe-405e-bf5a-c75a0d7e3930')
+ def test_associate_qos(self):
+ # Create a qos
+ qos = self.create_test_qos_specs()
+ # create a test volume-type
+ vol_type = self.create_volume_type()['id']
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # associate the qos-specs with volume-types
+ self.client.associate_qos(qos['id'], vol_type)
+ self.addCleanup(self.client.disassociate_qos, qos['id'], vol_type)
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume_extension:qos_specs_manage:read")
+ @decorators.idempotent_id('ff1e98f3-d456-40a9-96d4-c7e4a55dcffa')
+ def test_get_association_qos(self):
+ # create a test volume-type
+ qos = self.create_test_qos_specs()
+ vol_type = self.create_volume_type()['id']
+ # associate the qos-specs with volume-types
+ self.client.associate_qos(qos['id'], vol_type)
+ self.addCleanup(self.client.disassociate_qos, qos['id'], vol_type)
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # get the association of the qos-specs
+ self.client.show_association_qos(qos['id'])
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:update")
+ @decorators.idempotent_id('f12aeca1-0c02-4f33-b805-014171e5b2d4')
+ def test_disassociate_qos(self):
+ # create a test volume-type
+ qos = self.create_test_qos_specs()
+ vol_type = self.create_volume_type()['id']
+ # associate the qos-specs with volume-types
+ self.client.associate_qos(qos['id'], vol_type)
+ self.addCleanup(test_utils.call_and_ignore_notfound_exc,
+ self.client.disassociate_qos, qos['id'], vol_type)
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # disassociate a volume-type with qos-specs
+ self.client.disassociate_qos(qos['id'], vol_type)
+ operation = 'disassociate'
+ waiters.wait_for_qos_operations(self.client, qos['id'],
+ operation, args=vol_type)
+
+ @rbac_rule_validation.action(
+ service="cinder", rule="volume_extension:qos_specs_manage:update")
+ @decorators.idempotent_id('9f6e664d-a5d9-4e71-b122-73a3086be1b9')
+ def test_disassociate_all_qos(self):
+ qos = self.create_test_qos_specs()
+ # create a test volume-type
+ vol_type = self.create_volume_type()['id']
+ # associate the qos-specs with volume-types
+ self.client.associate_qos(qos['id'], vol_type)
+ self.addCleanup(test_utils.call_and_ignore_notfound_exc,
+ self.client.disassociate_qos, qos['id'], vol_type)
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # disassociate all volume-types from qos-specs
+ self.client.disassociate_all_qos(qos['id'])
+ operation = 'disassociate-all'
+ waiters.wait_for_qos_operations(self.client, qos['id'],
+ operation)
diff --git a/patrole_tempest_plugin/tests/api/volume/admin/test_volume_quotas_rbac.py b/patrole_tempest_plugin/tests/api/volume/admin/test_volume_quotas_rbac.py
index 851dec3..c4bd578 100644
--- a/patrole_tempest_plugin/tests/api/volume/admin/test_volume_quotas_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/admin/test_volume_quotas_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/rbac_base.py b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
index e92b980..67953ee 100644
--- a/patrole_tempest_plugin/tests/api/volume/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/volume/rbac_base.py
@@ -1,4 +1,4 @@
-# Copyright 2017 at&t
+# Copyright 2017 AT&T Corporation.
# 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
diff --git a/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py
new file mode 100644
index 0000000..d6426dd
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py
@@ -0,0 +1,42 @@
+# Copyright 2017 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 import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class AvailabilityZoneRbacTest(rbac_base.BaseVolumeRbacTest):
+
+ @classmethod
+ def setup_clients(cls):
+ super(AvailabilityZoneRbacTest, cls).setup_clients()
+ cls.client = cls.availability_zone_client
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(AvailabilityZoneRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:availability_zone_list")
+ @decorators.idempotent_id('8cfd920c-4b6c-402d-b6e2-ede86bedc702')
+ def test_get_availability_zone_list(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.list_availability_zones()
diff --git a/patrole_tempest_plugin/tests/api/volume/test_extensions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_extensions_rbac.py
new file mode 100644
index 0000000..a0ff55f
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_extensions_rbac.py
@@ -0,0 +1,41 @@
+# Copyright 2017 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 import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class ExtensionsRbacTest(rbac_base.BaseVolumeRbacTest):
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(ExtensionsRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:list_extensions")
+ @decorators.idempotent_id('7f2dcc41-e850-493f-a400-82db4e2b50c0')
+ def test_list_extensions(self):
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.volumes_extension_client.list_extensions()
+
+
+class ExtensionsV3RbacTest(ExtensionsRbacTest):
+ _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
index 703b284..c321400 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_snapshots_actions_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_create_delete_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_create_delete_rbac.py
index 7d4fe30..4814fa7 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_create_delete_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_create_delete_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
index e266827..234865c 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volume_metadata_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2017 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py
new file mode 100644
index 0000000..87e98e2
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_extend_rbac.py
@@ -0,0 +1,52 @@
+# Copyright 2017 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 waiters
+from tempest import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class VolumesExtendRbacTest(rbac_base.BaseVolumeRbacTest):
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(VolumesExtendRbacTest, self).tearDown()
+
+ @classmethod
+ def resource_setup(cls):
+ super(VolumesExtendRbacTest, cls).resource_setup()
+ # Create a test shared volume for tests
+ cls.volume = cls.create_volume()
+
+ @rbac_rule_validation.action(service="cinder", rule="volume:extend")
+ @decorators.idempotent_id('1627b065-4081-4e14-8340-8e4fb02ceaf2')
+ def test_volume_extend(self):
+ # Extend volume test
+ extend_size = int(self.volume['size']) + 1
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.volumes_client.extend_volume(self.volume['id'],
+ new_size=extend_size)
+ waiters.wait_for_volume_status(self.volumes_client, self.volume['id'],
+ 'available')
+
+
+class VolumesExtendV3RbacTest(VolumesExtendRbacTest):
+ _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_list_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_list_rbac.py
new file mode 100644
index 0000000..90e238c
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_list_rbac.py
@@ -0,0 +1,56 @@
+# Copyright 2017 AT&T Corp
+# 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 import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class VolumesListRbacTest(rbac_base.BaseVolumeRbacTest):
+
+ @classmethod
+ def setup_clients(cls):
+ super(VolumesListRbacTest, cls).setup_clients()
+ cls.client = cls.os.volumes_client
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(VolumesListRbacTest, self).tearDown()
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:get_all")
+ @decorators.idempotent_id('e3ab7906-b04b-4c45-aa11-1104d302f940')
+ def test_volume_list(self):
+ # Get a list of Volumes
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.list_volumes()
+
+ @rbac_rule_validation.action(
+ service="cinder",
+ rule="volume_extension:get_volumes_image_metadata")
+ @decorators.idempotent_id('3d48ca91-f02b-4616-a69d-4a8b296c8529')
+ def test_volume_list_image_metadata(self):
+ # Get a list of Volumes
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.list_volumes(detail=True)
+
+
+class VolumeListV3RbacTest(VolumesListRbacTest):
+ _api_version = 3
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
index 3e21444..5d889e8 100644
--- a/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_rbac.py
@@ -1,4 +1,4 @@
-# Copyright 2016 AT&T Corp
+# Copyright 2017 AT&T Corporation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py
new file mode 100644
index 0000000..2fb8885
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_volumes_snapshots_rbac.py
@@ -0,0 +1,114 @@
+# Copyright 2017 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 import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class VolumesSnapshotRbacTest(rbac_base.BaseVolumeRbacTest):
+
+ @classmethod
+ def setup_clients(cls):
+ super(VolumesSnapshotRbacTest, cls).setup_clients()
+ cls.client = cls.snapshots_client
+
+ def tearDown(self):
+ rbac_utils.switch_role(self, switchToRbacRole=False)
+ super(VolumesSnapshotRbacTest, self).tearDown()
+
+ @classmethod
+ def skip_checks(cls):
+ super(VolumesSnapshotRbacTest, cls).skip_checks()
+ if not CONF.volume_feature_enabled.snapshot:
+ raise cls.skipException("Cinder volume snapshots are disabled")
+
+ @classmethod
+ def resource_setup(cls):
+ super(VolumesSnapshotRbacTest, cls).resource_setup()
+ # Create a test shared volume for tests
+ cls.name_field = cls.special_fields['name_field']
+ cls.descrip_field = cls.special_fields['descrip_field']
+ cls.volume = cls.create_volume()
+ # Create a test shared snapshot for tests
+ cls.snapshot = cls.create_snapshot(cls.volume['id'])
+
+ def _list_by_param_values(self, params, with_detail=False):
+ # Perform list or list_details action with given params
+ # and validates result.
+
+ if with_detail:
+ self.snapshots_client.list_snapshots(
+ detail=True, params=params)['snapshots']
+ else:
+ self.snapshots_client.list_snapshots(
+ params=params)['snapshots']
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:create_snapshot")
+ @decorators.idempotent_id('ac7b2ee5-fbc0-4360-afc2-de8fa4881ede')
+ def test_snapshot_create(self):
+ # Create a temp snapshot
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.create_snapshot(self.volume['id'])
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:get_snapshot")
+ @decorators.idempotent_id('93a11b40-1ba8-44d6-a196-f8d97220f796')
+ def test_snapshot_get(self):
+ # Get the snapshot
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.show_snapshot(self.snapshot
+ ['id'])['snapshot']
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:update_snapshot")
+ @decorators.idempotent_id('53fe8ee3-3bea-4ae8-a979-3c98ea72f620')
+ def test_snapshot_update(self):
+ new_desc = 'This is the new description of snapshot.'
+ params = {self.descrip_field: new_desc}
+ # Updates snapshot with new values
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self.client.update_snapshot(
+ self.snapshot['id'], **params)['snapshot']
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:get_all_snapshots")
+ @decorators.idempotent_id('e4edf0c0-2cd3-420f-b8ab-4d98a0718608')
+ def test_snapshots_get_all(self):
+ """list snapshots with params."""
+ # Verify list snapshots by display_name filter
+ params = {self.name_field: self.snapshot[self.name_field]}
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ self._list_by_param_values(params)
+
+ @rbac_rule_validation.action(service="cinder",
+ rule="volume:delete_snapshot")
+ @decorators.idempotent_id('c7fe54ec-3b70-4772-ba11-f166d95888a3')
+ def test_snapshot_delete(self):
+ # Create a temp snapshot
+ temp_snapshot = self.create_snapshot(self.volume['id'])
+ rbac_utils.switch_role(self, switchToRbacRole=True)
+ # Delete the snapshot
+ self.client.delete_snapshot(temp_snapshot['id'])
+
+
+class VolumesSnapshotV3RbacTest(VolumesSnapshotRbacTest):
+ _api_version = 3
diff --git a/setup.py b/setup.py
index 3dccac1..f730546 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2016 AT&T inc.
+# Copyright 2017 ATT 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.
diff --git a/tests/base.py b/tests/base.py
index 14872ac..d73ff43 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -1,6 +1,6 @@
# Copyright 2010-2011 OpenStack Foundation
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-# Copyright (c) 2016 AT&T Inc
+# Copyright 2017 AT&T Corporation.
#
# 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
diff --git a/tests/test_patrole.py b/tests/test_patrole.py
index 3e85142..d374e20 100644
--- a/tests/test_patrole.py
+++ b/tests/test_patrole.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2016 AT&T Inc
+# Copyright 2017 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
diff --git a/tests/test_rbac_role_converter.py b/tests/test_rbac_role_converter.py
index dadab88..04eb626 100644
--- a/tests/test_rbac_role_converter.py
+++ b/tests/test_rbac_role_converter.py
@@ -1,4 +1,5 @@
-# Copyright 2017 AT&T Inc.
+# Copyright 2017 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
@@ -38,8 +39,6 @@
def test_custom_policy(self):
default_roles = ['zero', 'one', 'two', 'three', 'four',
'five', 'six', 'seven', 'eight', 'nine']
- CONF.set_override('rbac_roles', default_roles, group='rbac',
- enforce_type=True)
converter = rbac_role_converter.RbacPolicyConverter(
None, "test", self.custom_policy_file)
@@ -66,10 +65,6 @@
self.assertFalse(converter.allowed(rule, role))
def test_admin_policy_file_with_admin_role(self):
- default_roles = ['admin', 'Member']
- CONF.set_override('rbac_roles', default_roles, group='rbac',
- enforce_type=True)
-
converter = rbac_role_converter.RbacPolicyConverter(
None, "test", self.admin_policy_file)
@@ -89,10 +84,6 @@
self.assertFalse(allowed)
def test_admin_policy_file_with_member_role(self):
- default_roles = ['admin', 'Member']
- CONF.set_override('rbac_roles', default_roles, group='rbac',
- enforce_type=True)
-
converter = rbac_role_converter.RbacPolicyConverter(
None, "test", self.admin_policy_file)
diff --git a/tests/test_rbac_utils.py b/tests/test_rbac_utils.py
index 657b389..3c645f8 100644
--- a/tests/test_rbac_utils.py
+++ b/tests/test_rbac_utils.py
@@ -1,4 +1,5 @@
-# Copyright 2017 AT&T Inc.
+# Copyright 2017 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