From fa8791ecb3ac75f8be547cd52d8309045b55a5d7 Mon Sep 17 00:00:00 2001 From: Miriam Yumi Date: Tue, 4 Sep 2018 14:42:14 -0300 Subject: [PATCH] Fix consistency groups test credentials This patch fixes the test for consistency groups, changing it to an admin test in order to perform required operations. Change-Id: I5f7fd8d62ace7d880a27697cf2b15fbb13cde706 Depends-On: I8bdfc31bb2baeabe1d599ea6e9be3c473531f8b6 Closes-Bug: #1789944 --- cinder_tempest_plugin/api/volume/admin/__init__.py | 0 .../api/volume/{ => admin}/test_consistencygroups.py | 2 +- cinder_tempest_plugin/api/volume/base.py | 12 ++++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 cinder_tempest_plugin/api/volume/admin/__init__.py rename cinder_tempest_plugin/api/volume/{ => admin}/test_consistencygroups.py (99%) diff --git a/cinder_tempest_plugin/api/volume/admin/__init__.py b/cinder_tempest_plugin/api/volume/admin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/cinder_tempest_plugin/api/volume/test_consistencygroups.py b/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py similarity index 99% rename from cinder_tempest_plugin/api/volume/test_consistencygroups.py rename to cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py index d6b8e4a..15d19dc 100644 --- a/cinder_tempest_plugin/api/volume/test_consistencygroups.py +++ b/cinder_tempest_plugin/api/volume/admin/test_consistencygroups.py @@ -25,7 +25,7 @@ from cinder_tempest_plugin import cinder_clients CONF = config.CONF -class ConsistencyGroupsV2Test(base.BaseVolumeTest): +class ConsistencyGroupsV2Test(base.BaseVolumeAdminTest): @classmethod def setup_clients(cls): cls._api_version = 2 diff --git a/cinder_tempest_plugin/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py index b3765e0..d1e71ef 100644 --- a/cinder_tempest_plugin/api/volume/base.py +++ b/cinder_tempest_plugin/api/volume/base.py @@ -168,3 +168,15 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest, self.os_primary.servers_client.delete_server, body['id']) return body + + +class BaseVolumeAdminTest(BaseVolumeTest): + """Base test case class for all Volume Admin API tests.""" + + credentials = ['primary', 'admin'] + + @classmethod + def setup_clients(cls): + super(BaseVolumeAdminTest, cls).setup_clients() + + cls.admin_volume_types_client = cls.os_admin.volume_types_client_latest