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

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -30,20 +30,6 @@ class TestFlavor(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestFlavor, self).setUp()
 
-        # SDK mock
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.flavors = mock.Mock()
-        self.sdk_client.find_flavor = mock.Mock()
-        self.sdk_client.delete_flavor = mock.Mock()
-        self.sdk_client.update_flavor = mock.Mock()
-        self.sdk_client.flavor_add_tenant_access = mock.Mock()
-        self.sdk_client.flavor_remove_tenant_access = mock.Mock()
-        self.sdk_client.create_flavor_extra_specs = mock.Mock()
-        self.sdk_client.update_flavor_extra_specs_property = mock.Mock()
-        self.sdk_client.delete_flavor_extra_specs_property = mock.Mock()
-
         self.projects_mock = self.app.client_manager.identity.projects
         self.projects_mock.reset_mock()
 
@@ -101,7 +87,7 @@ class TestFlavorCreate(TestFlavor):
 
         # Return a project
         self.projects_mock.get.return_value = self.project
-        self.sdk_client.create_flavor.return_value = self.flavor
+        self.compute_sdk_client.create_flavor.return_value = self.flavor
         self.cmd = flavor.CreateFlavor(self.app, None)
 
     def test_flavor_create_default_options(self):
@@ -124,7 +110,9 @@ class TestFlavorCreate(TestFlavor):
         }
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.create_flavor.assert_called_once_with(**default_args)
+        self.compute_sdk_client.create_flavor.assert_called_once_with(
+            **default_args
+        )
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
@@ -191,8 +179,8 @@ class TestFlavorCreate(TestFlavor):
         # convert expected data tuple to list to be able to modify it
         cmp_data = list(self.data)
         cmp_data[7] = format_columns.DictColumn(props)
-        self.sdk_client.create_flavor.return_value = create_flavor
-        self.sdk_client.create_flavor_extra_specs.return_value = (
+        self.compute_sdk_client.create_flavor.return_value = create_flavor
+        self.compute_sdk_client.create_flavor_extra_specs.return_value = (
             expected_flavor
         )
 
@@ -200,11 +188,13 @@ class TestFlavorCreate(TestFlavor):
             sdk_utils, 'supports_microversion', return_value=True
         ):
             columns, data = self.cmd.take_action(parsed_args)
-            self.sdk_client.create_flavor.assert_called_once_with(**args)
-            self.sdk_client.create_flavor_extra_specs.assert_called_once_with(
+            self.compute_sdk_client.create_flavor.assert_called_once_with(
+                **args
+            )
+            self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with(
                 create_flavor, props
             )
-            self.sdk_client.get_flavor_access.assert_not_called()
+            self.compute_sdk_client.get_flavor_access.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(tuple(cmp_data), data)
@@ -277,8 +267,8 @@ class TestFlavorCreate(TestFlavor):
         # convert expected data tuple to list to be able to modify it
         cmp_data = list(self.data_private)
         cmp_data[7] = format_columns.DictColumn(props)
-        self.sdk_client.create_flavor.return_value = create_flavor
-        self.sdk_client.create_flavor_extra_specs.return_value = (
+        self.compute_sdk_client.create_flavor.return_value = create_flavor
+        self.compute_sdk_client.create_flavor_extra_specs.return_value = (
             expected_flavor
         )
 
@@ -286,12 +276,12 @@ class TestFlavorCreate(TestFlavor):
             sdk_utils, 'supports_microversion', return_value=True
         ):
             columns, data = self.cmd.take_action(parsed_args)
-        self.sdk_client.create_flavor.assert_called_once_with(**args)
-        self.sdk_client.flavor_add_tenant_access.assert_called_with(
+        self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
+        self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.sdk_client.create_flavor_extra_specs.assert_called_with(
+        self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
             create_flavor, props
         )
         self.assertEqual(self.columns, columns)
@@ -376,7 +366,7 @@ class TestFlavorCreate(TestFlavor):
             'description': 'fake description',
         }
 
-        self.sdk_client.create_flavor.assert_called_once_with(**args)
+        self.compute_sdk_client.create_flavor.assert_called_once_with(**args)
 
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data_private, data)
@@ -415,7 +405,7 @@ class TestFlavorDelete(TestFlavor):
     def setUp(self):
         super(TestFlavorDelete, self).setUp()
 
-        self.sdk_client.delete_flavor.return_value = None
+        self.compute_sdk_client.delete_flavor.return_value = None
 
         self.cmd = flavor.DeleteFlavor(self.app, None)
 
@@ -426,14 +416,16 @@ class TestFlavorDelete(TestFlavor):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.find_flavor.return_value = self.flavors[0]
+        self.compute_sdk_client.find_flavor.return_value = self.flavors[0]
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             self.flavors[0].id, ignore_missing=False
         )
-        self.sdk_client.delete_flavor.assert_called_with(self.flavors[0].id)
+        self.compute_sdk_client.delete_flavor.assert_called_with(
+            self.flavors[0].id
+        )
         self.assertIsNone(result)
 
     def test_delete_multiple_flavors(self):
@@ -446,7 +438,7 @@ class TestFlavorDelete(TestFlavor):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.find_flavor.side_effect = self.flavors
+        self.compute_sdk_client.find_flavor.side_effect = self.flavors
 
         result = self.cmd.take_action(parsed_args)
 
@@ -454,8 +446,8 @@ class TestFlavorDelete(TestFlavor):
             mock.call(i.id, ignore_missing=False) for i in self.flavors
         ]
         delete_calls = [mock.call(i.id) for i in self.flavors]
-        self.sdk_client.find_flavor.assert_has_calls(find_calls)
-        self.sdk_client.delete_flavor.assert_has_calls(delete_calls)
+        self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
+        self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
         self.assertIsNone(result)
 
     def test_multi_flavors_delete_with_exception(self):
@@ -466,7 +458,7 @@ class TestFlavorDelete(TestFlavor):
         verifylist = [('flavor', [self.flavors[0].id, 'unexist_flavor'])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.sdk_client.find_flavor.side_effect = [
+        self.compute_sdk_client.find_flavor.side_effect = [
             self.flavors[0],
             sdk_exceptions.ResourceNotFound,
         ]
@@ -482,8 +474,8 @@ class TestFlavorDelete(TestFlavor):
             mock.call('unexist_flavor', ignore_missing=False),
         ]
         delete_calls = [mock.call(self.flavors[0].id)]
-        self.sdk_client.find_flavor.assert_has_calls(find_calls)
-        self.sdk_client.delete_flavor.assert_has_calls(delete_calls)
+        self.compute_sdk_client.find_flavor.assert_has_calls(find_calls)
+        self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls)
 
 
 class TestFlavorList(TestFlavor):
@@ -529,7 +521,7 @@ class TestFlavorList(TestFlavor):
             [],
         ]
 
-        self.sdk_client.flavors = self.api_mock
+        self.compute_sdk_client.flavors = self.api_mock
 
         # Get the command object to test
         self.cmd = flavor.ListFlavor(self.app, None)
@@ -554,8 +546,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -580,8 +572,8 @@ class TestFlavorList(TestFlavor):
             'is_public': None,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -606,8 +598,8 @@ class TestFlavorList(TestFlavor):
             'is_public': False,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -632,8 +624,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, tuple(data))
@@ -658,8 +650,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns_long, columns)
         self.assertCountEqual(self.data_long, tuple(data))
@@ -691,8 +683,10 @@ class TestFlavorList(TestFlavor):
             [],
         ]
 
-        self.sdk_client.flavors = self.api_mock
-        self.sdk_client.fetch_flavor_extra_specs = mock.Mock(return_value=None)
+        self.compute_sdk_client.flavors = self.api_mock
+        self.compute_sdk_client.fetch_flavor_extra_specs = mock.Mock(
+            return_value=None
+        )
 
         arglist = [
             '--long',
@@ -713,8 +707,8 @@ class TestFlavorList(TestFlavor):
             'is_public': True,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_called_once_with(
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_called_once_with(
             flavor
         )
 
@@ -747,15 +741,15 @@ class TestFlavorList(TestFlavor):
             'min_ram': 2048,
         }
 
-        self.sdk_client.flavors.assert_called_with(**kwargs)
-        self.sdk_client.fetch_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.flavors.assert_called_with(**kwargs)
+        self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called()
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(tuple(self.data), tuple(data))
 
 
 class TestFlavorSet(TestFlavor):
-    # Return value of self.sdk_client.find_flavor().
+    # Return value of self.compute_sdk_client.find_flavor().
     flavor = compute_fakes.create_one_flavor(
         attrs={'os-flavor-access:is_public': False}
     )
@@ -764,7 +758,7 @@ class TestFlavorSet(TestFlavor):
     def setUp(self):
         super(TestFlavorSet, self).setUp()
 
-        self.sdk_client.find_flavor.return_value = self.flavor
+        self.compute_sdk_client.find_flavor.return_value = self.flavor
         # Return a project
         self.projects_mock.get.return_value = self.project
         self.cmd = flavor.SetFlavor(self.app, None)
@@ -778,10 +772,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.sdk_client.create_flavor_extra_specs.assert_called_with(
+        self.compute_sdk_client.create_flavor_extra_specs.assert_called_with(
             self.flavor.id, {'FOO': '"B A R"'}
         )
         self.assertIsNone(result)
@@ -792,10 +786,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.sdk_client.delete_flavor_extra_specs_property.assert_called_with(
+        self.compute_sdk_client.delete_flavor_extra_specs_property.assert_called_with(
             self.flavor.id, 'property'
         )
         self.assertIsNone(result)
@@ -814,14 +808,14 @@ class TestFlavorSet(TestFlavor):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.sdk_client.flavor_add_tenant_access.assert_called_with(
+        self.compute_sdk_client.flavor_add_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.sdk_client.create_flavor_extra_specs.assert_not_called()
+        self.compute_sdk_client.create_flavor_extra_specs.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_set_no_project(self):
@@ -858,7 +852,7 @@ class TestFlavorSet(TestFlavor):
         )
 
     def test_flavor_set_with_unexist_flavor(self):
-        self.sdk_client.find_flavor.side_effect = [
+        self.compute_sdk_client.find_flavor.side_effect = [
             sdk_exceptions.ResourceNotFound()
         ]
 
@@ -887,10 +881,10 @@ class TestFlavorSet(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.sdk_client.flavor_add_tenant_access.assert_not_called()
+        self.compute_sdk_client.flavor_add_tenant_access.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_set_description_api_newer(self):
@@ -904,12 +898,12 @@ class TestFlavorSet(TestFlavor):
             ('flavor', self.flavor.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.compute.api_version = 2.55
+
         with mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=True
         ):
             result = self.cmd.take_action(parsed_args)
-            self.sdk_client.update_flavor.assert_called_with(
+            self.compute_sdk_client.update_flavor.assert_called_with(
                 flavor=self.flavor.id, description='description'
             )
             self.assertIsNone(result)
@@ -925,7 +919,7 @@ class TestFlavorSet(TestFlavor):
             ('flavor', self.flavor.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.compute.api_version = 2.54
+
         with mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=False
         ):
@@ -944,13 +938,12 @@ class TestFlavorSet(TestFlavor):
             ('flavor', self.flavor.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.compute.api_version = 2.55
 
         with mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=True
         ):
             result = self.cmd.take_action(parsed_args)
-            self.sdk_client.update_flavor.assert_called_with(
+            self.compute_sdk_client.update_flavor.assert_called_with(
                 flavor=self.flavor.id, description='description'
             )
             self.assertIsNone(result)
@@ -966,7 +959,6 @@ class TestFlavorSet(TestFlavor):
             ('flavor', self.flavor.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.compute.api_version = 2.54
 
         with mock.patch.object(
             sdk_utils, 'supports_microversion', return_value=False
@@ -977,7 +969,7 @@ class TestFlavorSet(TestFlavor):
 
 
 class TestFlavorShow(TestFlavor):
-    # Return value of self.sdk_client.find_flavor().
+    # Return value of self.compute_sdk_client.find_flavor().
     flavor_access = compute_fakes.create_one_flavor_access()
     flavor = compute_fakes.create_one_flavor()
 
@@ -1017,8 +1009,10 @@ class TestFlavorShow(TestFlavor):
         super(TestFlavorShow, self).setUp()
 
         # Return value of _find_resource()
-        self.sdk_client.find_flavor.return_value = self.flavor
-        self.sdk_client.get_flavor_access.return_value = [self.flavor_access]
+        self.compute_sdk_client.find_flavor.return_value = self.flavor
+        self.compute_sdk_client.get_flavor_access.return_value = [
+            self.flavor_access
+        ]
         self.cmd = flavor.ShowFlavor(self.app, None)
 
     def test_show_no_options(self):
@@ -1055,7 +1049,7 @@ class TestFlavorShow(TestFlavor):
                 'os-flavor-access:is_public': False,
             }
         )
-        self.sdk_client.find_flavor.return_value = private_flavor
+        self.compute_sdk_client.find_flavor.return_value = private_flavor
 
         arglist = [
             private_flavor.name,
@@ -1084,7 +1078,7 @@ class TestFlavorShow(TestFlavor):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.get_flavor_access.assert_called_with(
+        self.compute_sdk_client.get_flavor_access.assert_called_with(
             flavor=private_flavor.id
         )
         self.assertEqual(self.columns, columns)
@@ -1092,7 +1086,7 @@ class TestFlavorShow(TestFlavor):
 
 
 class TestFlavorUnset(TestFlavor):
-    # Return value of self.sdk_client.find_flavor().
+    # Return value of self.compute_sdk_client.find_flavor().
     flavor = compute_fakes.create_one_flavor(
         attrs={'os-flavor-access:is_public': False}
     )
@@ -1101,12 +1095,14 @@ class TestFlavorUnset(TestFlavor):
     def setUp(self):
         super(TestFlavorUnset, self).setUp()
 
-        self.sdk_client.find_flavor.return_value = self.flavor
+        self.compute_sdk_client.find_flavor.return_value = self.flavor
         # Return a project
         self.projects_mock.get.return_value = self.project
         self.cmd = flavor.UnsetFlavor(self.app, None)
 
-        self.mock_shortcut = self.sdk_client.delete_flavor_extra_specs_property
+        self.mock_shortcut = (
+            self.compute_sdk_client.delete_flavor_extra_specs_property
+        )
 
     def test_flavor_unset_property(self):
         arglist = ['--property', 'property', 'baremetal']
@@ -1117,11 +1113,11 @@ class TestFlavorUnset(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
         self.mock_shortcut.assert_called_with(self.flavor.id, 'property')
-        self.sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_unset_properties(self):
@@ -1139,7 +1135,7 @@ class TestFlavorUnset(TestFlavor):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         self.cmd.take_action(parsed_args)
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
         calls = [
@@ -1154,7 +1150,7 @@ class TestFlavorUnset(TestFlavor):
             AssertionError, self.mock_shortcut.assert_has_calls, calls
         )
 
-        self.sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()
 
     def test_flavor_unset_project(self):
         arglist = [
@@ -1171,14 +1167,14 @@ class TestFlavorUnset(TestFlavor):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.find_flavor.assert_called_with(
+        self.compute_sdk_client.find_flavor.assert_called_with(
             parsed_args.flavor, get_extra_specs=True, ignore_missing=False
         )
-        self.sdk_client.flavor_remove_tenant_access.assert_called_with(
+        self.compute_sdk_client.flavor_remove_tenant_access.assert_called_with(
             self.flavor.id,
             self.project.id,
         )
-        self.sdk_client.delete_flavor_extra_specs_proerty.assert_not_called()
+        self.compute_sdk_client.delete_flavor_extra_specs_property.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_unset_no_project(self):
@@ -1215,7 +1211,7 @@ class TestFlavorUnset(TestFlavor):
         )
 
     def test_flavor_unset_with_unexist_flavor(self):
-        self.sdk_client.find_flavor.side_effect = [
+        self.compute_sdk_client.find_flavor.side_effect = [
             sdk_exceptions.ResourceNotFound
         ]
 
@@ -1245,4 +1241,4 @@ class TestFlavorUnset(TestFlavor):
         result = self.cmd.take_action(parsed_args)
         self.assertIsNone(result)
 
-        self.sdk_client.flavor_remove_tenant_access.assert_not_called()
+        self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called()

openstackclient/tests/unit/compute/v2/test_host.py

@@ -21,25 +21,14 @@ from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestHost(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestHost, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-        self.sdk_client.get = mock.Mock()
-
-
 @mock.patch('openstackclient.api.compute_v2.APIv2.host_list')
-class TestHostList(TestHost):
+class TestHostList(compute_fakes.TestComputev2):
     _host = compute_fakes.create_one_host()
 
     def setUp(self):
         super(TestHostList, self).setUp()
 
-        self.sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
             data={'hosts': [self._host]}
         )
 
@@ -64,7 +53,9 @@ class TestHostList(TestHost):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
+        self.compute_sdk_client.get.assert_called_with(
+            '/os-hosts', microversion='2.1'
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
@@ -82,13 +73,15 @@ class TestHostList(TestHost):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1')
+        self.compute_sdk_client.get.assert_called_with(
+            '/os-hosts', microversion='2.1'
+        )
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.host_set')
-class TestHostSet(TestHost):
+class TestHostSet(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestHostSet, self).setUp()
 
@@ -138,7 +131,7 @@ class TestHostSet(TestHost):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.host_show')
-class TestHostShow(TestHost):
+class TestHostShow(compute_fakes.TestComputev2):
     _host = compute_fakes.create_one_host()
 
     def setUp(self):
@@ -154,7 +147,7 @@ class TestHostShow(TestHost):
             }
         }
 
-        self.sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
             data={'host': [output_data]}
         )
 
@@ -205,7 +198,7 @@ class TestHostShow(TestHost):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.get.assert_called_with(
+        self.compute_sdk_client.get.assert_called_with(
             '/os-hosts/' + self._host['host_name'], microversion='2.1'
         )
         self.assertEqual(self.columns, columns)