python-openstackclient 7.3.1__py3-none-any.whl → 8.0.0__py3-none-any.whl

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

@@ -27,9 +27,7 @@ class TestServerBackup(compute_fakes.TestComputev2):
         servers = compute_fakes.create_sdk_servers(
             count=count,
         )
-
-        # This is the return value for compute_client.find_server()
-        self.compute_sdk_client.find_server = compute_fakes.get_servers(
+        self.compute_client.find_server = compute_fakes.get_servers(
             servers,
             0,
         )
@@ -110,7 +108,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.backup_server.assert_called_with(
+        self.compute_client.backup_server.assert_called_with(
             servers[0].id,
             servers[0].name,
             '',
@@ -146,7 +144,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.backup_server.assert_called_with(
+        self.compute_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',
@@ -186,7 +184,7 @@ class TestServerBackupCreate(TestServerBackup):
             parsed_args,
         )
 
-        self.compute_sdk_client.backup_server.assert_called_with(
+        self.compute_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',
@@ -227,7 +225,7 @@ class TestServerBackupCreate(TestServerBackup):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.backup_server.assert_called_with(
+        self.compute_client.backup_server.assert_called_with(
             servers[0].id,
             'image',
             'daily',

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

@@ -64,8 +64,8 @@ class TestListServerEvent(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_server.return_value = self.fake_server
-        self.compute_sdk_client.server_actions.return_value = [
+        self.compute_client.find_server.return_value = self.fake_server
+        self.compute_client.server_actions.return_value = [
             self.fake_event,
         ]
 
@@ -83,11 +83,11 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id
         )
 
@@ -107,11 +107,11 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id
         )
 
@@ -134,11 +134,11 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id,
             changes_since='2016-03-04T06:27:59Z',
         )
@@ -214,11 +214,11 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id,
             changes_before='2016-03-04T06:27:59Z',
         )
@@ -290,7 +290,7 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id,
             limit=1,
             paginated=False,
@@ -337,7 +337,7 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.server_actions.assert_called_with(
+        self.compute_client.server_actions.assert_called_with(
             self.fake_server.id,
             marker='test_event',
         )
@@ -392,10 +392,8 @@ class TestShowServerEvent(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_server.return_value = self.fake_server
-        self.compute_sdk_client.get_server_action.return_value = (
-            self.fake_event
-        )
+        self.compute_client.find_server.return_value = self.fake_server
+        self.compute_client.get_server_action.return_value = self.fake_event
 
         self.cmd = server_event.ShowServerEvent(self.app, None)
 
@@ -412,11 +410,11 @@ class TestShowServerEvent(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.fake_server.name,
             ignore_missing=False,
         )
-        self.compute_sdk_client.get_server_action.assert_called_with(
+        self.compute_client.get_server_action.assert_called_with(
             self.fake_event.request_id,
             self.fake_server.id,
         )

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

@@ -55,7 +55,7 @@ class TestServerGroupCreate(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.create_server_group.return_value = (
+        self.compute_client.create_server_group.return_value = (
             self.fake_server_group
         )
         self.cmd = server_group.CreateServerGroup(self.app, None)
@@ -74,7 +74,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_server_group.assert_called_once_with(
+        self.compute_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
         )
@@ -96,7 +96,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_server_group.assert_called_once_with(
+        self.compute_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
         )
@@ -141,7 +141,7 @@ class TestServerGroupCreate(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.create_server_group.assert_called_once_with(
+        self.compute_client.create_server_group.assert_called_once_with(
             name=parsed_args.name,
             policy=parsed_args.policy,
             rules=parsed_args.rules,
@@ -179,7 +179,7 @@ class TestServerGroupDelete(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_server_group.return_value = (
+        self.compute_client.find_server_group.return_value = (
             self.fake_server_group
         )
         self.cmd = server_group.DeleteServerGroup(self.app, None)
@@ -193,10 +193,10 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_server_group.assert_called_once_with(
+        self.compute_client.find_server_group.assert_called_once_with(
             'affinity_group', ignore_missing=False
         )
-        self.compute_sdk_client.delete_server_group.assert_called_once_with(
+        self.compute_client.delete_server_group.assert_called_once_with(
             self.fake_server_group.id
         )
         self.assertIsNone(result)
@@ -208,21 +208,17 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.find_server_group.assert_any_call(
+        self.compute_client.find_server_group.assert_any_call(
             'affinity_group', ignore_missing=False
         )
-        self.compute_sdk_client.find_server_group.assert_any_call(
+        self.compute_client.find_server_group.assert_any_call(
             'anti_affinity_group', ignore_missing=False
         )
-        self.compute_sdk_client.delete_server_group.assert_called_with(
+        self.compute_client.delete_server_group.assert_called_with(
             self.fake_server_group.id
         )
-        self.assertEqual(
-            2, self.compute_sdk_client.find_server_group.call_count
-        )
-        self.assertEqual(
-            2, self.compute_sdk_client.delete_server_group.call_count
-        )
+        self.assertEqual(2, self.compute_client.find_server_group.call_count)
+        self.assertEqual(2, self.compute_client.delete_server_group.call_count)
         self.assertIsNone(result)
 
     def test_server_group_delete_no_input(self):
@@ -243,7 +239,7 @@ class TestServerGroupDelete(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.find_server_group.side_effect = [
+        self.compute_client.find_server_group.side_effect = [
             self.fake_server_group,
             exceptions.CommandError,
         ]
@@ -253,16 +249,14 @@ class TestServerGroupDelete(TestServerGroup):
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 server groups failed to delete.', str(e))
 
-        self.compute_sdk_client.find_server_group.assert_any_call(
+        self.compute_client.find_server_group.assert_any_call(
             'affinity_group', ignore_missing=False
         )
-        self.compute_sdk_client.find_server_group.assert_any_call(
+        self.compute_client.find_server_group.assert_any_call(
             'anti_affinity_group', ignore_missing=False
         )
-        self.assertEqual(
-            2, self.compute_sdk_client.find_server_group.call_count
-        )
-        self.compute_sdk_client.delete_server_group.assert_called_once_with(
+        self.assertEqual(2, self.compute_client.find_server_group.call_count)
+        self.compute_client.delete_server_group.assert_called_once_with(
             self.fake_server_group.id
         )
 
@@ -271,7 +265,7 @@ class TestServerGroupList(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.server_groups.return_value = [
+        self.compute_client.server_groups.return_value = [
             self.fake_server_group
         ]
         self.cmd = server_group.ListServerGroup(self.app, None)
@@ -287,7 +281,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.server_groups.assert_called_once_with()
+        self.compute_client.server_groups.assert_called_once_with()
 
         expected_columns = (
             'ID',
@@ -318,7 +312,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.server_groups.assert_called_once_with(
+        self.compute_client.server_groups.assert_called_once_with(
             all_projects=True
         )
 
@@ -359,7 +353,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.server_groups.assert_called_once_with(limit=1)
+        self.compute_client.server_groups.assert_called_once_with(limit=1)
 
     def test_server_group_list_with_offset(self):
         arglist = [
@@ -376,7 +370,7 @@ class TestServerGroupList(TestServerGroup):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.server_groups.assert_called_once_with(offset=5)
+        self.compute_client.server_groups.assert_called_once_with(offset=5)
 
     def test_server_group_list_v264(self):
         self.set_compute_api_version('2.64')
@@ -388,7 +382,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.server_groups.assert_called_once_with()
+        self.compute_client.server_groups.assert_called_once_with()
 
         expected_columns = (
             'ID',
@@ -419,7 +413,7 @@ class TestServerGroupList(TestServerGroup):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
-        self.compute_sdk_client.server_groups.assert_called_once_with(
+        self.compute_client.server_groups.assert_called_once_with(
             all_projects=True
         )
 
@@ -450,7 +444,7 @@ class TestServerGroupShow(TestServerGroup):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.find_server_group.return_value = (
+        self.compute_client.find_server_group.return_value = (
             self.fake_server_group
         )
         self.cmd = server_group.ShowServerGroup(self.app, None)

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

@@ -26,9 +26,7 @@ class TestServerImage(compute_fakes.TestComputev2):
         servers = compute_fakes.create_sdk_servers(
             count=count,
         )
-
-        # This is the return value for compute_client.find_server()
-        self.compute_sdk_client.find_server = compute_fakes.get_servers(
+        self.compute_client.find_server = compute_fakes.get_servers(
             servers,
             0,
         )
@@ -85,7 +83,7 @@ class TestServerImageCreate(TestServerImage):
             )
 
         self.image_client.find_image = mock.Mock(side_effect=images)
-        self.compute_sdk_client.create_server_image = mock.Mock(
+        self.compute_client.create_server_image = mock.Mock(
             return_value=images[0],
         )
         return images
@@ -107,7 +105,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
+        self.compute_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,
@@ -139,7 +137,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
+        self.compute_client.create_server_image.assert_called_with(
             servers[0].id,
             'img-nam',
             {'key': 'value'},
@@ -169,7 +167,7 @@ class TestServerImageCreate(TestServerImage):
             parsed_args,
         )
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
+        self.compute_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,
@@ -199,7 +197,7 @@ class TestServerImageCreate(TestServerImage):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.create_server_image.assert_called_with(
+        self.compute_client.create_server_image.assert_called_with(
             servers[0].id,
             servers[0].name,
             None,

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

@@ -53,10 +53,10 @@ class TestListMigration(compute_fakes.TestComputev2):
         super().setUp()
 
         self.server = compute_fakes.create_one_sdk_server()
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         self.migrations = compute_fakes.create_migrations(count=3)
-        self.compute_sdk_client.migrations.return_value = self.migrations
+        self.compute_client.migrations.return_value = self.migrations
 
         self.data = (
             common_utils.get_item_properties(s, self.MIGRATION_FIELDS)
@@ -76,7 +76,7 @@ class TestListMigration(compute_fakes.TestComputev2):
         # Set expected values
         kwargs = {}
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -108,10 +108,10 @@ class TestListMigration(compute_fakes.TestComputev2):
             'migration_type': 'migration',
         }
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             'server1', ignore_missing=False
         )
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -169,7 +169,7 @@ class TestListMigrationV223(TestListMigration):
             'status': 'migrating',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -247,7 +247,7 @@ class TestListMigrationV259(TestListMigration):
             'changes_since': '2019-08-09T08:03:25Z',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -376,7 +376,7 @@ class TestListMigrationV266(TestListMigration):
             'changes_before': '2019-08-09T08:03:25Z',
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.assertEqual(self.MIGRATION_COLUMNS, columns)
         self.assertEqual(tuple(self.data), tuple(data))
@@ -495,7 +495,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -572,7 +572,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(len(self.MIGRATION_COLUMNS) - 2, "User")
         self.MIGRATION_FIELDS.insert(len(self.MIGRATION_FIELDS) - 2, "user_id")
@@ -644,7 +644,7 @@ class TestListMigrationV280(TestListMigration):
             'changes_before': "2019-08-09T08:03:25Z",
         }
 
-        self.compute_sdk_client.migrations.assert_called_with(**kwargs)
+        self.compute_client.migrations.assert_called_with(**kwargs)
 
         self.MIGRATION_COLUMNS.insert(
             len(self.MIGRATION_COLUMNS) - 2, "Project"
@@ -695,13 +695,13 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         super().setUp()
 
         self.server = compute_fakes.create_one_sdk_server()
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.get_server_migration.return_value = (
+        self.compute_client.get_server_migration.return_value = (
             self.server_migration
         )
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -759,10 +759,10 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.get_server_migration.assert_called_with(
+        self.compute_client.get_server_migration.assert_called_with(
             self.server.id, '2', ignore_missing=False
         )
 
@@ -811,7 +811,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
     def test_server_migration_show_by_uuid(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -830,18 +830,18 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.get_server_migration.assert_not_called()
+        self.compute_client.get_server_migration.assert_not_called()
 
     def test_server_migration_show_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -900,7 +900,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
         self.server = compute_fakes.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.AbortMigration(self.app, None)
@@ -917,10 +917,10 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.abort_server_migration.assert_called_with(
+        self.compute_client.abort_server_migration.assert_called_with(
             '2', self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -946,7 +946,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
         self.set_compute_api_version('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -959,13 +959,13 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.abort_server_migration.assert_called_with(
+        self.compute_client.abort_server_migration.assert_called_with(
             self.server_migration.id, self.server.id, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -973,7 +973,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
     def test_server_migration_abort_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,
@@ -1015,7 +1015,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
         self.server = compute_fakes.create_one_sdk_server()
 
         # Return value for utils.find_resource for server.
-        self.compute_sdk_client.find_server.return_value = self.server
+        self.compute_client.find_server.return_value = self.server
 
         # Get the command object to test
         self.cmd = server_migration.ForceCompleteMigration(self.app, None)
@@ -1032,10 +1032,10 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_client.force_complete_server_migration.assert_called_with(
             '2', self.server.id
         )
         self.assertIsNone(result)
@@ -1061,7 +1061,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
         self.set_compute_api_version('2.59')
 
         self.server_migration = compute_fakes.create_one_server_migration()
-        self.compute_sdk_client.server_migrations.return_value = iter(
+        self.compute_client.server_migrations.return_value = iter(
             [self.server_migration]
         )
 
@@ -1074,13 +1074,13 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.find_server.assert_called_with(
+        self.compute_client.find_server.assert_called_with(
             self.server.id, ignore_missing=False
         )
-        self.compute_sdk_client.server_migrations.assert_called_with(
+        self.compute_client.server_migrations.assert_called_with(
             self.server.id
         )
-        self.compute_sdk_client.force_complete_server_migration.assert_called_with(
+        self.compute_client.force_complete_server_migration.assert_called_with(
             self.server_migration.id, self.server.id
         )
         self.assertIsNone(result)
@@ -1088,7 +1088,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
     def test_server_migration_force_complete_by_uuid_no_matches(self):
         self.set_compute_api_version('2.59')
 
-        self.compute_sdk_client.server_migrations.return_value = iter([])
+        self.compute_client.server_migrations.return_value = iter([])
 
         arglist = [
             self.server.id,