python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/unit/volume/v3/test_volume_group.py

@@ -24,20 +24,16 @@ class TestVolumeGroup(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volume_groups_mock = self.app.client_manager.volume.groups
+        self.volume_groups_mock = self.volume_client.groups
         self.volume_groups_mock.reset_mock()
 
-        self.volume_group_types_mock = (
-            self.app.client_manager.volume.group_types
-        )
+        self.volume_group_types_mock = self.volume_client.group_types
         self.volume_group_types_mock.reset_mock()
 
-        self.volume_types_mock = self.app.client_manager.volume.volume_types
+        self.volume_types_mock = self.volume_client.volume_types
         self.volume_types_mock.reset_mock()
 
-        self.volume_group_snapshots_mock = (
-            self.app.client_manager.volume.group_snapshots
-        )
+        self.volume_group_snapshots_mock = self.volume_client.group_snapshots
         self.volume_group_snapshots_mock.reset_mock()
 
 
@@ -100,9 +96,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         self.cmd = volume_group.CreateVolumeGroup(self.app, None)
 
     def test_volume_group_create(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             '--volume-group-type',
@@ -138,9 +132,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_create__legacy(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -180,9 +172,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         )
 
     def test_volume_group_create_no_volume_type(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             '--volume-group-type',
@@ -204,9 +194,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         )
 
     def test_volume_group_create_with_options(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             '--volume-group-type',
@@ -248,9 +236,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_create_pre_v313(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.12'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.12')
 
         arglist = [
             '--volume-group-type',
@@ -275,9 +261,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         )
 
     def test_volume_group_create_from_source_group(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.14')
 
         arglist = [
             '--source-group',
@@ -306,9 +290,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_create_from_group_snapshot(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.14')
 
         arglist = [
             '--group-snapshot',
@@ -337,9 +319,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_create_from_src_pre_v314(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             '--source-group',
@@ -358,9 +338,7 @@ class TestVolumeGroupCreate(TestVolumeGroup):
         )
 
     def test_volume_group_create_from_src_source_group_group_snapshot(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.14')
 
         arglist = [
             '--source-group',
@@ -398,9 +376,7 @@ class TestVolumeGroupDelete(TestVolumeGroup):
         self.cmd = volume_group.DeleteVolumeGroup(self.app, None)
 
     def test_volume_group_delete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             self.fake_volume_group.id,
@@ -421,9 +397,7 @@ class TestVolumeGroupDelete(TestVolumeGroup):
         self.assertIsNone(result)
 
     def test_volume_group_delete_pre_v313(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.12'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.12')
 
         arglist = [
             self.fake_volume_group.id,
@@ -481,9 +455,7 @@ class TestVolumeGroupSet(TestVolumeGroup):
         self.cmd = volume_group.SetVolumeGroup(self.app, None)
 
     def test_volume_group_set(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             self.fake_volume_group.id,
@@ -510,9 +482,7 @@ class TestVolumeGroupSet(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_with_enable_replication_option(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.38'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.38')
 
         arglist = [
             self.fake_volume_group.id,
@@ -533,9 +503,7 @@ class TestVolumeGroupSet(TestVolumeGroup):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_set_pre_v313(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.12'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.12')
 
         arglist = [
             self.fake_volume_group.id,
@@ -559,9 +527,7 @@ class TestVolumeGroupSet(TestVolumeGroup):
         )
 
     def test_volume_group_with_enable_replication_option_pre_v338(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.37'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.37')
 
         arglist = [
             self.fake_volume_group.id,
@@ -606,9 +572,7 @@ class TestVolumeGroupList(TestVolumeGroup):
         self.cmd = volume_group.ListVolumeGroup(self.app, None)
 
     def test_volume_group_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.13')
 
         arglist = [
             '--all-projects',
@@ -629,9 +593,7 @@ class TestVolumeGroupList(TestVolumeGroup):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_group_list_pre_v313(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.12'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.12')
 
         arglist = [
             '--all-projects',
@@ -661,9 +623,7 @@ class TestVolumeGroupFailover(TestVolumeGroup):
         self.cmd = volume_group.FailoverVolumeGroup(self.app, None)
 
     def test_volume_group_failover(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.38'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.38')
 
         arglist = [
             self.fake_volume_group.id,
@@ -688,9 +648,7 @@ class TestVolumeGroupFailover(TestVolumeGroup):
         self.assertIsNone(result)
 
     def test_volume_group_failover_pre_v338(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.37'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.37')
 
         arglist = [
             self.fake_volume_group.id,

openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py

@@ -10,30 +10,32 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from cinderclient import api_versions
+from unittest import mock
+
+from keystoneauth1 import discover
+from openstack.block_storage.v3 import group as _group
+from openstack.block_storage.v3 import group_snapshot as _group_snapshot
+from openstack.test import fakes as sdk_fakes
+from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 from openstackclient.volume.v3 import volume_group_snapshot
 
 
-class TestVolumeGroupSnapshot(volume_fakes.TestVolume):
-    def setUp(self):
-        super().setUp()
+def fake_supports_microversion(mocked_version):
+    def supports_microversion(adapter, microversion, raise_exception=False):
+        required = discover.normalize_version_number(microversion)
+        candidate = discover.normalize_version_number(mocked_version)
+        return discover.version_match(required, candidate)
 
-        self.volume_groups_mock = self.app.client_manager.volume.groups
-        self.volume_groups_mock.reset_mock()
-
-        self.volume_group_snapshots_mock = (
-            self.app.client_manager.volume.group_snapshots
-        )
-        self.volume_group_snapshots_mock.reset_mock()
+    return supports_microversion
 
 
-class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
-    fake_volume_group = volume_fakes.create_one_volume_group()
-    fake_volume_group_snapshot = (
-        volume_fakes.create_one_volume_group_snapshot()
+class TestVolumeGroupSnapshotCreate(volume_fakes.TestVolume):
+    fake_volume_group = sdk_fakes.generate_fake_resource(_group.Group)
+    fake_volume_group_snapshot = sdk_fakes.generate_fake_resource(
+        _group_snapshot.GroupSnapshot,
     )
 
     columns = (
@@ -56,11 +58,11 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
     def setUp(self):
         super().setUp()
 
-        self.volume_groups_mock.get.return_value = self.fake_volume_group
-        self.volume_group_snapshots_mock.create.return_value = (
+        self.volume_sdk_client.find_group.return_value = self.fake_volume_group
+        self.volume_sdk_client.create_group_snapshot.return_value = (
             self.fake_volume_group_snapshot
         )
-        self.volume_group_snapshots_mock.get.return_value = (
+        self.volume_sdk_client.find_group_snapshot.return_value = (
             self.fake_volume_group_snapshot
         )
 
@@ -68,10 +70,9 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
             self.app, None
         )
 
-    def test_volume_group_snapshot_create(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_create(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.14')
 
         arglist = [
             self.fake_volume_group.id,
@@ -85,21 +86,22 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volume_groups_mock.get.assert_called_once_with(
-            self.fake_volume_group.id
-        )
-        self.volume_group_snapshots_mock.create.assert_called_once_with(
+        self.volume_sdk_client.find_group.assert_called_once_with(
             self.fake_volume_group.id,
-            None,
-            None,
+            ignore_missing=False,
+            details=False,
+        )
+        self.volume_sdk_client.create_group_snapshot.assert_called_once_with(
+            group_id=self.fake_volume_group.id,
+            name=None,
+            description=None,
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    def test_volume_group_snapshot_create_with_options(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_create_with_options(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.14')
 
         arglist = [
             self.fake_volume_group.id,
@@ -117,21 +119,22 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volume_groups_mock.get.assert_called_once_with(
-            self.fake_volume_group.id
-        )
-        self.volume_group_snapshots_mock.create.assert_called_once_with(
+        self.volume_sdk_client.find_group.assert_called_once_with(
             self.fake_volume_group.id,
-            'foo',
-            'hello, world',
+            ignore_missing=False,
+            details=False,
+        )
+        self.volume_sdk_client.create_group_snapshot.assert_called_once_with(
+            group_id=self.fake_volume_group.id,
+            name='foo',
+            description='hello, world',
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    def test_volume_group_snapshot_create_pre_v314(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_create_pre_v314(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.13')
 
         arglist = [
             self.fake_volume_group.id,
@@ -144,34 +147,36 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
         )
         self.assertIn(
-            '--os-volume-api-version 3.14 or greater is required', str(exc)
+            '--os-volume-api-version 3.14 or greater is required',
+            str(exc),
         )
 
 
-class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot):
-    fake_volume_group_snapshot = (
-        volume_fakes.create_one_volume_group_snapshot()
+class TestVolumeGroupSnapshotDelete(volume_fakes.TestVolume):
+    fake_volume_group_snapshot = sdk_fakes.generate_fake_resource(
+        _group_snapshot.GroupSnapshot,
     )
 
     def setUp(self):
         super().setUp()
 
-        self.volume_group_snapshots_mock.get.return_value = (
+        self.volume_sdk_client.find_group_snapshot.return_value = (
             self.fake_volume_group_snapshot
         )
-        self.volume_group_snapshots_mock.delete.return_value = None
+        self.volume_sdk_client.delete_group_snapshot.return_value = None
 
         self.cmd = volume_group_snapshot.DeleteVolumeGroupSnapshot(
             self.app, None
         )
 
-    def test_volume_group_snapshot_delete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_delete(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.14')
 
         arglist = [
             self.fake_volume_group_snapshot.id,
@@ -183,15 +188,14 @@ class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.volume_group_snapshots_mock.delete.assert_called_once_with(
+        self.volume_sdk_client.delete_group_snapshot.assert_called_once_with(
             self.fake_volume_group_snapshot.id,
         )
         self.assertIsNone(result)
 
-    def test_volume_group_snapshot_delete_pre_v314(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_delete_pre_v314(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.13')
 
         arglist = [
             self.fake_volume_group_snapshot.id,
@@ -202,15 +206,23 @@ class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
         )
         self.assertIn(
-            '--os-volume-api-version 3.14 or greater is required', str(exc)
+            '--os-volume-api-version 3.14 or greater is required',
+            str(exc),
         )
 
 
-class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot):
-    fake_volume_group_snapshots = volume_fakes.create_volume_group_snapshots()
+class TestVolumeGroupSnapshotList(volume_fakes.TestVolume):
+    fake_volume_group_snapshots = list(
+        sdk_fakes.generate_fake_resources(
+            _group_snapshot.GroupSnapshot,
+            count=3,
+        )
+    )
 
     columns = (
         'ID',
@@ -229,7 +241,7 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot):
     def setUp(self):
         super().setUp()
 
-        self.volume_group_snapshots_mock.list.return_value = (
+        self.volume_sdk_client.group_snapshots.return_value = (
             self.fake_volume_group_snapshots
         )
 
@@ -237,10 +249,9 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot):
             self.app, None
         )
 
-    def test_volume_group_snapshot_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.14'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_list(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.14')
 
         arglist = [
             '--all-projects',
@@ -252,18 +263,15 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.volume_group_snapshots_mock.list.assert_called_once_with(
-            search_opts={
-                'all_tenants': True,
-            },
+        self.volume_sdk_client.group_snapshots.assert_called_once_with(
+            all_projects=True,
         )
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(tuple(self.data), data)
 
-    def test_volume_group_snapshot_list_pre_v314(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.13'
-        )
+    @mock.patch.object(sdk_utils, 'supports_microversion')
+    def test_volume_group_snapshot_list_pre_v314(self, mock_mv):
+        mock_mv.side_effect = fake_supports_microversion('3.13')
 
         arglist = []
         verifylist = [
@@ -272,8 +280,11 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         exc = self.assertRaises(
-            exceptions.CommandError, self.cmd.take_action, parsed_args
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
         )
         self.assertIn(
-            '--os-volume-api-version 3.14 or greater is required', str(exc)
+            '--os-volume-api-version 3.14 or greater is required',
+            str(exc),
         )

openstackclient/tests/unit/volume/v3/test_volume_group_type.py

@@ -24,9 +24,7 @@ class TestVolumeGroupType(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volume_group_types_mock = (
-            self.app.client_manager.volume.group_types
-        )
+        self.volume_group_types_mock = self.volume_client.group_types
         self.volume_group_types_mock.reset_mock()
 
 
@@ -60,9 +58,7 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType):
         self.cmd = volume_group_type.CreateVolumeGroupType(self.app, None)
 
     def test_volume_group_type_create(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             self.fake_volume_group_type.name,
@@ -83,9 +79,7 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_type_create_with_options(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             self.fake_volume_group_type.name,
@@ -109,9 +103,7 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_type_create_pre_v311(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.10'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.10')
 
         arglist = [
             self.fake_volume_group_type.name,
@@ -145,9 +137,7 @@ class TestVolumeGroupTypeDelete(TestVolumeGroupType):
         self.cmd = volume_group_type.DeleteVolumeGroupType(self.app, None)
 
     def test_volume_group_type_delete(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -165,9 +155,7 @@ class TestVolumeGroupTypeDelete(TestVolumeGroupType):
         self.assertIsNone(result)
 
     def test_volume_group_type_delete_pre_v311(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.10'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.10')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -222,9 +210,7 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType):
         self.cmd = volume_group_type.SetVolumeGroupType(self.app, None)
 
     def test_volume_group_type_set(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         self.fake_volume_group_type.set_keys.return_value = None
 
@@ -263,9 +249,7 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_type_with_no_property_option(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -296,9 +280,7 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_type_set_pre_v311(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.10'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.10')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -355,9 +337,7 @@ class TestVolumeGroupTypeUnset(TestVolumeGroupType):
         self.cmd = volume_group_type.UnsetVolumeGroupType(self.app, None)
 
     def test_volume_group_type_unset(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -385,9 +365,7 @@ class TestVolumeGroupTypeUnset(TestVolumeGroupType):
         self.assertCountEqual(self.data, data)
 
     def test_volume_group_type_unset_pre_v311(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.10'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.10')
 
         arglist = [
             self.fake_volume_group_type.id,
@@ -440,9 +418,7 @@ class TestVolumeGroupTypeList(TestVolumeGroupType):
         self.cmd = volume_group_type.ListVolumeGroupType(self.app, None)
 
     def test_volume_group_type_list(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = []
         verifylist = [
@@ -457,9 +433,7 @@ class TestVolumeGroupTypeList(TestVolumeGroupType):
         self.assertCountEqual(tuple(self.data), data)
 
     def test_volume_group_type_list_with_default_option(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.11'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.11')
 
         arglist = [
             '--default',
@@ -476,9 +450,7 @@ class TestVolumeGroupTypeList(TestVolumeGroupType):
         self.assertCountEqual(tuple([self.data[0]]), data)
 
     def test_volume_group_type_list_pre_v311(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.10'
-        )
+        self.volume_client.api_version = api_versions.APIVersion('3.10')
 
         arglist = []
         verifylist = []