python-openstackclient 10.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

openstackclient/tests/unit/common/test_module.py

@@ -22,42 +22,61 @@ from openstackclient.tests.unit import utils
 
 
 class FakeModule:
-    def __init__(self, name, version):
+    def __init__(self, name):
         self.name = name
-        self.__version__ = version
-        # Workaround for openstacksdk case
-        self.version = mock.Mock()
-        self.version.__version__ = version
 
 
 # NOTE(dtroyer): module_1 must match the version list filter (not --all)
 #                currently == '*client*'
 module_name_1 = 'fakeclient'
-module_version_1 = '0.1.2'
+package_name_1 = 'python-fakeclient'
+package_version_1 = '0.1.2'
 
-module_name_2 = 'zlib'
-module_version_2 = '1.1'
+# module_2 match openstacksdk
+module_name_2 = 'openstack'
+package_name_2 = 'openstacksdk'
+package_version_2 = '0.9.13'
 
-# module_3 match openstacksdk
-module_name_3 = 'openstack'
-module_version_3 = '0.9.13'
+# module_3 match sub module of fakeclient
+module_name_3 = 'fakeclient.submodule'
+package_name_3 = 'python-fakeclient'
+package_version_3 = '0.2.2'
 
-# module_4 match sub module of fakeclient
-module_name_4 = 'fakeclient.submodule'
-module_version_4 = '0.2.2'
+# module_4 match non-client package
+module_name_4 = 'requests'
+package_name_4 = 'requests'
+package_version_4 = '2.34.2'
 
 # module_5 match private module
 module_name_5 = '_private_module.lib'
-module_version_5 = '0.0.1'
 
 MODULES = {
     'sys': sys,
-    module_name_1: FakeModule(module_name_1, module_version_1),
-    module_name_2: FakeModule(module_name_2, module_version_2),
-    module_name_3: FakeModule(module_name_3, module_version_3),
-    module_name_4: FakeModule(module_name_4, module_version_4),
-    module_name_5: FakeModule(module_name_5, module_version_5),
+    module_name_1: FakeModule(module_name_1),
+    module_name_2: FakeModule(module_name_2),
+    module_name_3: FakeModule(module_name_3),
+    module_name_4: FakeModule(module_name_4),
+    module_name_5: FakeModule(module_name_5),
 }
+PACKAGES = {
+    module_name_1: [package_name_1],
+    module_name_2: [package_name_2],
+    module_name_3: [package_name_3],
+    module_name_4: [package_name_4],
+}
+
+
+def fake_metadata_version(package):
+    if package == package_name_1:
+        return package_version_1
+    if package == package_name_2:
+        return package_version_2
+    if package == package_name_3:
+        return package_version_3
+    if package == package_name_4:
+        return package_version_4
+
+    raise Exception('unrecognised package')
 
 
 class TestCommandList(utils.TestCommand):
@@ -145,25 +164,31 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        with mock.patch.dict(
-            'openstackclient.common.module.sys.modules',
-            values=MODULES,
-            clear=True,
+        with (
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.packages_distributions',
+                return_value=PACKAGES,
+            ),
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.version',
+                side_effect=fake_metadata_version,
+            ),
+            mock.patch.dict(
+                'openstackclient.common.module.sys.modules',
+                values=MODULES,
+                clear=True,
+            ),
         ):
             columns, data = self.cmd.take_action(parsed_args)
 
         # Output xxxclient and openstacksdk, but not regular module, like: zlib
         self.assertIn(module_name_1, columns)
-        self.assertIn(module_version_1, data)
-        self.assertNotIn(module_name_2, columns)
-        self.assertNotIn(module_version_2, data)
-        self.assertIn(module_name_3, columns)
-        self.assertIn(module_version_3, data)
+        self.assertIn(package_version_1, data)
+        self.assertIn(module_name_2, columns)
+        self.assertIn(package_version_2, data)
         # Filter sub and private modules
-        self.assertNotIn(module_name_4, columns)
-        self.assertNotIn(module_version_4, data)
+        self.assertNotIn(module_name_3, columns)
         self.assertNotIn(module_name_5, columns)
-        self.assertNotIn(module_version_5, data)
 
     def test_module_list_all(self):
         arglist = [
@@ -177,22 +202,30 @@ class TestModuleList(utils.TestCommand):
         # In base command class Lister in cliff, abstract method take_action()
         # returns a tuple containing the column names and an iterable
         # containing the data to be listed.
-        with mock.patch.dict(
-            'openstackclient.common.module.sys.modules',
-            values=MODULES,
-            clear=True,
+        with (
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.packages_distributions',
+                return_value=PACKAGES,
+            ),
+            mock.patch(
+                'openstackclient.common.module.importlib.metadata.version',
+                side_effect=fake_metadata_version,
+            ),
+            mock.patch.dict(
+                'openstackclient.common.module.sys.modules',
+                values=MODULES,
+                clear=True,
+            ),
         ):
             columns, data = self.cmd.take_action(parsed_args)
 
-        # Output xxxclient, openstacksdk and regular module, like: zlib
+        # Output xxxclient, openstacksdk and regular modules like requests
         self.assertIn(module_name_1, columns)
-        self.assertIn(module_version_1, data)
+        self.assertIn(package_version_1, data)
         self.assertIn(module_name_2, columns)
-        self.assertIn(module_version_2, data)
-        self.assertIn(module_name_3, columns)
-        self.assertIn(module_version_3, data)
+        self.assertIn(package_version_2, data)
+        self.assertIn(module_name_4, columns)
+        self.assertIn(package_version_4, data)
         # Filter sub and private modules
-        self.assertNotIn(module_name_4, columns)
-        self.assertNotIn(module_version_4, data)
+        self.assertNotIn(module_name_3, columns)
         self.assertNotIn(module_name_5, columns)
-        self.assertNotIn(module_version_5, data)

openstackclient/tests/unit/common/test_quota.py

@@ -68,6 +68,7 @@ class TestQuotaList(TestQuota):
         'Networks',
         'Ports',
         'RBAC Policies',
+        'Router Routes',
         'Routers',
         'Security Groups',
         'Security Group Rules',
@@ -80,6 +81,7 @@ class TestQuotaList(TestQuota):
         'Backups',
         'Backup Gigabytes',
         'Gigabytes',
+        'Groups',
         'Per Volume Gigabytes',
         'Snapshots',
         'Volumes',
@@ -133,6 +135,10 @@ class TestQuotaList(TestQuota):
             self.network_quotas[0].networks,
             self.network_quotas[0].ports,
             self.network_quotas[0].rbac_policies,
+            # TODO(ralonsoh): restore once [1] is merged and released.
+            # [1]https://review.opendev.org/c/openstack/openstacksdk/+/991063
+            # self.network_quotas[0].router_routes,
+            getattr(self.network_quotas[0], 'router_routes', ''),
             self.network_quotas[0].routers,
             self.network_quotas[0].security_groups,
             self.network_quotas[0].security_group_rules,
@@ -156,6 +162,7 @@ class TestQuotaList(TestQuota):
             self.volume_quotas[0].backups,
             self.volume_quotas[0].backup_gigabytes,
             self.volume_quotas[0].gigabytes,
+            self.volume_quotas[0].groups,
             self.volume_quotas[0].per_volume_gigabytes,
             self.volume_quotas[0].snapshots,
             self.volume_quotas[0].volumes,
@@ -946,6 +953,7 @@ class TestQuotaShow(TestQuota):
         'pools': {'limit': 0, 'reserved': 0, 'used': 0},
         'ports': {'limit': 0, 'reserved': 0, 'used': 0},
         'rbac_policies': {'limit': 0, 'reserved': 0, 'used': 0},
+        'router_routes': {'limit': 0, 'reserved': 0, 'used': 0},
         'routers': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_group_rules': {'limit': 0, 'reserved': 0, 'used': 0},
         'security_groups': {'limit': 0, 'reserved': 0, 'used': 0},
@@ -1144,6 +1152,7 @@ class TestQuotaShow(TestQuota):
                 ('pools', 0, 0, 0),
                 ('ports', 0, 0, 0),
                 ('rbac_policies', 0, 0, 0),
+                ('router_routes', 0, 0, 0),
                 ('routers', 0, 0, 0),
                 ('security_group_rules', 9, 5, 7),
                 ('security_groups', 0, 0, 0),

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

@@ -66,7 +66,7 @@ class FakeClientMixin:
         )
 
 
-class TestComputev2(
+class TestCompute(
     identity_fakes.FakeClientMixin,
     network_fakes.FakeClientMixin,
     image_fakes.FakeClientMixin,
@@ -104,20 +104,6 @@ def create_one_agent(attrs=None):
     return agent_attrs
 
 
-def create_agents(attrs=None, count=2):
-    """Create multiple fake agents.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of agents to fake
-    :return: A list of dictionaries faking the agents
-    """
-    agents = []
-    for i in range(0, count):
-        agents.append(create_one_agent(attrs))
-
-    return agents
-
-
 def create_one_extension(attrs=None):
     """Create a fake extension.
 
@@ -352,20 +338,6 @@ def create_one_flavor(attrs=None):
     return flavor
 
 
-def create_flavors(attrs=None, count=2):
-    """Create multiple fake flavors.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of flavors to fake
-    :return: A list of fake :class:`openstack.compute.v2.flavor.Flavor` objects
-    """
-    flavors = []
-    for i in range(0, count):
-        flavors.append(create_one_flavor(attrs))
-
-    return flavors
-
-
 def create_one_flavor_access(attrs=None):
     """Create a fake flavor access.
 
@@ -499,19 +471,6 @@ def create_one_floating_ip_pool(attrs=None):
     return floating_ip_pool_attrs
 
 
-def create_floating_ip_pools(attrs=None, count=2):
-    """Create multiple fake floating IP pools.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of floating IP pools to fake
-    :return: A list of dictionaries faking the floating IP pools
-    """
-    floating_ip_pools = []
-    for i in range(0, count):
-        floating_ip_pools.append(create_one_floating_ip_pool(attrs))
-    return floating_ip_pools
-
-
 def create_one_network(attrs=None):
     """Create a fake network.
 
@@ -730,21 +689,6 @@ def create_one_server_migration(attrs=None):
     return migration
 
 
-def create_server_migrations(attrs=None, methods=None, count=2):
-    """Create multiple server migrations.
-
-    :param dict attrs: A dictionary with all attributes
-    :param int count: The number of server migrations to fake
-    :return A list of fake
-        openstack.compute.v2.server_migration.ServerMigration objects
-    """
-    migrations = []
-    for i in range(0, count):
-        migrations.append(create_one_server_migration(attrs, methods))
-
-    return migrations
-
-
 def create_one_volume_attachment(attrs=None):
     """Create a fake volume attachment.
 

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

@@ -37,7 +37,7 @@ def _generate_fake_agent():
     }
 
 
-class TestAgentCreate(compute_fakes.TestComputev2):
+class TestAgentCreate(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -106,7 +106,7 @@ class TestAgentCreate(compute_fakes.TestComputev2):
         self.assertEqual(self.data, data)
 
 
-class TestAgentDelete(compute_fakes.TestComputev2):
+class TestAgentDelete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -180,7 +180,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
         )
 
 
-class TestAgentList(compute_fakes.TestComputev2):
+class TestAgentList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -247,7 +247,7 @@ class TestAgentList(compute_fakes.TestComputev2):
         )
 
 
-class TestAgentSet(compute_fakes.TestComputev2):
+class TestAgentSet(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -27,7 +27,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestAggregate(compute_fakes.TestComputev2):
+class TestAggregate(compute_fakes.TestCompute):
     columns = (
         'availability_zone',
         'created_at',

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

@@ -22,7 +22,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils
 
 
-class TestConsoleLog(compute_fakes.TestComputev2):
+class TestConsoleLog(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -77,7 +77,7 @@ class TestConsoleLog(compute_fakes.TestComputev2):
         )
 
 
-class TestConsoleUrlShow(compute_fakes.TestComputev2):
+class TestConsoleUrlShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -19,7 +19,7 @@ from openstackclient.compute.v2 import console_connection
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestConsoleTokens(compute_fakes.TestComputev2):
+class TestConsoleTokens(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -26,7 +26,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestFlavor(compute_fakes.TestComputev2):
+class TestFlavor(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -58,7 +58,7 @@ def _generate_fake_host():
     }
 
 
-class TestHostList(compute_fakes.TestComputev2):
+class TestHostList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -111,7 +111,7 @@ class TestHostList(compute_fakes.TestComputev2):
         self.assertEqual(self.data, list(data))
 
 
-class TestHostSet(compute_fakes.TestComputev2):
+class TestHostSet(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -160,7 +160,7 @@ class TestHostSet(compute_fakes.TestComputev2):
         )
 
 
-class TestHostShow(compute_fakes.TestComputev2):
+class TestHostShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -24,7 +24,7 @@ from openstackclient.compute.v2 import hypervisor
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestHypervisorList(compute_fakes.TestComputev2):
+class TestHypervisorList(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -280,7 +280,7 @@ class TestHypervisorList(compute_fakes.TestComputev2):
         )
 
 
-class TestHypervisorShow(compute_fakes.TestComputev2):
+class TestHypervisorShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -53,7 +53,7 @@ def create_one_hypervisor_stats(attrs=None):
     return stats_info
 
 
-class TestHypervisorStatsShow(compute_fakes.TestComputev2):
+class TestHypervisorStatsShow(compute_fakes.TestCompute):
     _stats = create_one_hypervisor_stats()
 
     def setUp(self):

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

@@ -28,7 +28,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestKeypair(compute_fakes.TestComputev2):
+class TestKeypair(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -64,7 +64,7 @@ class TestPowerStateColumn(test_utils.TestCase):
         self.assertEqual('N/A', server.PowerStateColumn(0x08).human_readable())
 
 
-class TestServer(compute_fakes.TestComputev2):
+class TestServer(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -967,8 +967,8 @@ class TestServerRemoveVolume(TestServerVolume):
 
         self.assertIsNone(result)
         self.compute_client.delete_volume_attachment.assert_called_once_with(
-            self.volume,
             self.server,
+            self.volume,
             ignore_missing=False,
         )
 
@@ -1064,7 +1064,7 @@ class TestServerAddNetwork(TestServer):
         )
 
 
-class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
+class TestServerAddSecurityGroup(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -4318,7 +4318,7 @@ class TestServerCreate(TestServer):
         self.compute_client.create_server.assert_not_called()
 
 
-class TestServerDelete(compute_fakes.TestComputev2):
+class TestServerDelete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -5825,7 +5825,7 @@ class TestServerListV2100(_TestServerList):
         self.assertCountEqual(columns, set(columns))
 
 
-class TestServerAction(compute_fakes.TestComputev2):
+class TestServerAction(compute_fakes.TestCompute):
     def run_method_with_sdk_servers(self, method_name, server_count):
         servers = compute_fakes.create_servers(count=server_count)
         self.compute_client.find_server.side_effect = servers
@@ -7486,7 +7486,7 @@ class TestServerEvacuate(TestServer):
         )
 
 
-class TestServerRemoveFixedIP(compute_fakes.TestComputev2):
+class TestServerRemoveFixedIP(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -7515,7 +7515,7 @@ class TestServerRemoveFixedIP(compute_fakes.TestComputev2):
         self.assertIsNone(result)
 
 
-class TestServerRescue(compute_fakes.TestComputev2):
+class TestServerRescue(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -7786,7 +7786,7 @@ class TestServerRemoveSecurityGroup(TestServer):
         self.assertIsNone(result)
 
 
-class TestServerResize(compute_fakes.TestComputev2):
+class TestServerResize(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -7992,7 +7992,7 @@ class TestServerResize(compute_fakes.TestComputev2):
         )
 
 
-class TestServerResizeConfirm(compute_fakes.TestComputev2):
+class TestServerResizeConfirm(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8024,7 +8024,7 @@ class TestServerResizeConfirm(compute_fakes.TestComputev2):
 
 
 # TODO(stephenfin): Remove in OSC 7.0
-class TestServerMigrateConfirm(compute_fakes.TestComputev2):
+class TestServerMigrateConfirm(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8062,7 +8062,7 @@ class TestServerMigrateConfirm(compute_fakes.TestComputev2):
         )
 
 
-class TestServerConfirmMigration(compute_fakes.TestComputev2):
+class TestServerConfirmMigration(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8093,7 +8093,7 @@ class TestServerConfirmMigration(compute_fakes.TestComputev2):
         self.assertIsNone(result)
 
 
-class TestServerResizeRevert(compute_fakes.TestComputev2):
+class TestServerResizeRevert(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8125,7 +8125,7 @@ class TestServerResizeRevert(compute_fakes.TestComputev2):
 
 
 # TODO(stephenfin): Remove in OSC 7.0
-class TestServerMigrateRevert(compute_fakes.TestComputev2):
+class TestServerMigrateRevert(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -8163,7 +8163,7 @@ class TestServerMigrateRevert(compute_fakes.TestComputev2):
         )
 
 
-class TestServerRevertMigration(compute_fakes.TestComputev2):
+class TestServerRevertMigration(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -9228,7 +9228,7 @@ class TestServerUnpause(TestServerAction):
         self.run_method_with_sdk_servers('unpause_server', 3)
 
 
-class TestServerUnrescue(compute_fakes.TestComputev2):
+class TestServerUnrescue(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -22,7 +22,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestServerBackupCreate(compute_fakes.TestComputev2):
+class TestServerBackupCreate(compute_fakes.TestCompute):
     def image_columns(self, image):
         columnlist = (
             'id',

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

@@ -21,7 +21,7 @@ from openstackclient.compute.v2 import server_event
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestListServerEvent(compute_fakes.TestComputev2):
+class TestListServerEvent(compute_fakes.TestCompute):
     fake_server = compute_fakes.create_one_server()
     fake_event = compute_fakes.create_one_server_action()
 
@@ -365,7 +365,7 @@ class TestListServerEvent(compute_fakes.TestComputev2):
         )
 
 
-class TestShowServerEvent(compute_fakes.TestComputev2):
+class TestShowServerEvent(compute_fakes.TestCompute):
     fake_server = compute_fakes.create_one_server()
     fake_event = compute_fakes.create_one_server_action()
     columns = (

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

@@ -23,7 +23,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestServerGroup(compute_fakes.TestComputev2):
+class TestServerGroup(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 

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

@@ -21,7 +21,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 
 
-class TestServerImageCreate(compute_fakes.TestComputev2):
+class TestServerImageCreate(compute_fakes.TestCompute):
     def image_columns(self, image):
         columnlist = (
             'id',

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

@@ -18,7 +18,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestListMigration(compute_fakes.TestComputev2):
+class TestListMigration(compute_fakes.TestCompute):
     """Test fetch all migrations."""
 
     MIGRATION_COLUMNS = [
@@ -690,7 +690,7 @@ class TestListMigrationV280(TestListMigration):
         )
 
 
-class TestServerMigrationShow(compute_fakes.TestComputev2):
+class TestServerMigrationShow(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -893,7 +893,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
         )
 
 
-class TestServerMigrationAbort(compute_fakes.TestComputev2):
+class TestServerMigrationAbort(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()
 
@@ -1008,7 +1008,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
         )
 
 
-class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
+class TestServerMigrationForceComplete(compute_fakes.TestCompute):
     def setUp(self):
         super().setUp()