Merge "fix tox python3 overrides"
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
--- /dev/null
+++ b/cinder_tempest_plugin/api/volume/admin/__init__.py
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 @@
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 @@
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