openstack/python-openstackclient
Code Issues Proposed changes

tests: Remove sdk prefix

Browse Source 
It is no longer necessary.

Change-Id: I6bcc14be90be7c93ec4729f241299d55885570fd
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2025-04-14 16:04:28 +01:00
parent 2c878ad2b7
commit abed52f106
8 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
openstackclient/tests/unit/compute/v2/fakes.py
View File

@ -126,7 +126,7 @@ def create_one_extension(attrs=None):
"""Create a fake extension. """Create a fake extension.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.extension.Extension object :return: A fake :class:`~openstack.compute.v2.extension.Extension` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -240,11 +240,11 @@ def create_security_group_rules(attrs=None, count=2):
return security_group_rules return security_group_rules
def create_one_sdk_server(attrs=None): def create_one_server(attrs=None):
"""Create a fake server for testing migration to sdk """Create a fake server
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.server.Server object, :return: A fake :class:`~openstack.compute.v2.server.Server` object,
""" """
attrs = attrs or {} attrs = attrs or {}
@ -272,16 +272,16 @@ def create_one_sdk_server(attrs=None):
return server return server
def create_sdk_servers(attrs=None, count=2): def create_servers(attrs=None, count=2):
"""Create multiple fake servers for testing migration to sdk """Create multiple fake servers
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:param int count: The number of servers to fake :param int count: The number of servers to fake
:return: A list of fake openstack.compute.v2.server.Server objects :return: A list of fake :class:`openstack.compute.v2.server.Server` objects
""" """
servers = [] servers = []
for i in range(0, count): for i in range(0, count):
servers.append(create_one_sdk_server(attrs)) servers.append(create_one_server(attrs))
return servers return servers
@ -290,7 +290,8 @@ def create_one_server_action(attrs=None):
"""Create a fake server action. """Create a fake server action.
:param attrs: A dictionary with all attributes :param attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.server_action.ServerAction object :return: A fake :class:`~openstack.compute.v2.server_action.ServerAction`
object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -333,7 +334,7 @@ def create_one_flavor(attrs=None):
"""Create a fake flavor. """Create a fake flavor.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.flavor.Flavor object :return: A fake :class:`~openstack.compute.v2.flavor.Flavor` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -366,7 +367,7 @@ def create_flavors(attrs=None, count=2):
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:param int count: The number of flavors to fake :param int count: The number of flavors to fake
:return: A list of fake openstack.compute.v2.flavor.Flavor objects :return: A list of fake :class:`openstack.compute.v2.flavor.Flavor` objects
""" """
flavors = [] flavors = []
for i in range(0, count): for i in range(0, count):
@ -405,8 +406,8 @@ def create_one_availability_zone(attrs=None):
"""Create a fake AZ. """Create a fake AZ.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.availability_zone.AvailabilityZone :return: A fake
object :class:`~openstack.compute.v2.availability_zone.AvailabilityZone` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -684,7 +685,7 @@ def create_one_migration(attrs=None):
"""Create a fake migration. """Create a fake migration.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.migration.Migration object :return: A fake :class:`~openstack.compute.v2.migration.Migration` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -720,7 +721,7 @@ def create_migrations(attrs=None, count=2):
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:param int count: The number of migrations to fake :param int count: The number of migrations to fake
:return: A list of fake openstack.compute.v2.migration.Migration objects :return: A list of fake :class:`openstack.compute.v2.migration.Migration` objects
""" """
migrations = [] migrations = []
for i in range(0, count): for i in range(0, count):
@ -733,7 +734,8 @@ def create_one_server_migration(attrs=None):
"""Create a fake server migration. """Create a fake server migration.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return A fake openstack.compute.v2.server_migration.ServerMigration object :return: A fake
:class:`~openstack.compute.v2.server_migration.ServerMigration` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -789,8 +791,8 @@ def create_one_volume_attachment(attrs=None):
"""Create a fake volume attachment. """Create a fake volume attachment.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:return: A fake openstack.compute.v2.volume_attachment.VolumeAttachment :return: A fake
object :class:`~openstack.compute.v2.volume_attachment.VolumeAttachment` object
""" """
attrs = attrs or {} attrs = attrs or {}
@ -831,12 +833,12 @@ def create_volume_attachments(attrs=None, count=2):
def create_one_server_interface(attrs=None): def create_one_server_interface(attrs=None):
"""Create a fake SDK ServerInterface. """Create a fake ServerInterface.
:param dict attrs: A dictionary with all attributes :param dict attrs: A dictionary with all attributes
:param dict methods: A dictionary with all methods :param dict methods: A dictionary with all methods
:return: A fake openstack.compute.v2.server_interface.ServerInterface :return: A fake
object :class:`~openstack.compute.v2.server_interface.ServerInterface` object
""" """
attrs = attrs or {} attrs = attrs or {}

80
openstackclient/tests/unit/compute/v2/test_server.py
View File

@ -70,7 +70,7 @@ class TestServer(compute_fakes.TestComputev2):
self.attrs = {} self.attrs = {}
def setup_sdk_servers_mock(self, count): def setup_sdk_servers_mock(self, count):
servers = compute_fakes.create_sdk_servers( servers = compute_fakes.create_servers(
attrs=self.attrs, attrs=self.attrs,
count=count, count=count,
) )
@ -348,7 +348,7 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2):
super().setUp() super().setUp()
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.cmd = server.AddFloatingIP(self.app, None) self.cmd = server.AddFloatingIP(self.app, None)
@ -404,7 +404,7 @@ class TestServerAddFloatingIPNetwork(
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.network_client.update_ip = mock.Mock(return_value=None) self.network_client.update_ip = mock.Mock(return_value=None)
@ -700,7 +700,7 @@ class TestServerVolume(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.volume = volume_fakes.create_one_sdk_volume() self.volume = volume_fakes.create_one_sdk_volume()
@ -1126,7 +1126,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.add_security_group_to_server.return_value = None self.compute_client.add_security_group_to_server.return_value = None
@ -1295,7 +1295,7 @@ class TestServerCreate(TestServer):
'image': self.image, 'image': self.image,
'flavor': self.flavor, 'flavor': self.flavor,
} }
self.server = compute_fakes.create_one_sdk_server(attrs=attrs) self.server = compute_fakes.create_one_server(attrs=attrs)
self.compute_client.create_server.return_value = self.server self.compute_client.create_server.return_value = self.server
self.compute_client.get_server.return_value = self.server self.compute_client.get_server.return_value = self.server
@ -4382,7 +4382,7 @@ class TestServerDelete(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.delete_server.return_value = None self.compute_client.delete_server.return_value = None
@ -4429,7 +4429,7 @@ class TestServerDelete(compute_fakes.TestComputev2):
self.assertIsNone(result) self.assertIsNone(result)
def test_server_delete_multi_servers(self): def test_server_delete_multi_servers(self):
servers = compute_fakes.create_sdk_servers(count=3) servers = compute_fakes.create_servers(count=3)
self.compute_client.find_server.return_value = None self.compute_client.find_server.return_value = None
self.compute_client.find_server.side_effect = servers self.compute_client.find_server.side_effect = servers
@ -5511,7 +5511,7 @@ class TestServerListV273(_TestServerList):
class TestServerAction(compute_fakes.TestComputev2): class TestServerAction(compute_fakes.TestComputev2):
def run_method_with_sdk_servers(self, method_name, server_count): def run_method_with_sdk_servers(self, method_name, server_count):
servers = compute_fakes.create_sdk_servers(count=server_count) servers = compute_fakes.create_servers(count=server_count)
self.compute_client.find_server.side_effect = servers self.compute_client.find_server.side_effect = servers
arglist = [s.id for s in servers] arglist = [s.id for s in servers]
@ -5544,7 +5544,7 @@ class TestServerLock(TestServerAction):
def test_server_lock_with_reason(self): def test_server_lock_with_reason(self):
self.set_compute_api_version('2.73') self.set_compute_api_version('2.73')
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.lock_server.return_value = None self.compute_client.lock_server.return_value = None
@ -5573,8 +5573,8 @@ class TestServerLock(TestServerAction):
def test_server_lock_with_reason_multi_servers(self): def test_server_lock_with_reason_multi_servers(self):
self.set_compute_api_version('2.73') self.set_compute_api_version('2.73')
server_a = compute_fakes.create_one_sdk_server() server_a = compute_fakes.create_one_server()
server_b = compute_fakes.create_one_sdk_server() server_b = compute_fakes.create_one_server()
self.compute_client.find_server.side_effect = [server_a, server_b] self.compute_client.find_server.side_effect = [server_a, server_b]
self.compute_client.lock_server.return_value = None self.compute_client.lock_server.return_value = None
@ -5603,7 +5603,7 @@ class TestServerLock(TestServerAction):
def test_server_lock_with_reason_pre_v273(self): def test_server_lock_with_reason_pre_v273(self):
self.set_compute_api_version('2.72') self.set_compute_api_version('2.72')
server = compute_fakes.create_one_sdk_server() server = compute_fakes.create_one_server()
arglist = [ arglist = [
server.id, server.id,
@ -5631,7 +5631,7 @@ class TestServerMigrate(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.migrate_server.return_value = None self.compute_client.migrate_server.return_value = None
self.compute_client.live_migrate_server.return_value = None self.compute_client.live_migrate_server.return_value = None
@ -6176,7 +6176,7 @@ class TestServerRebuild(TestServer):
'status': 'ACTIVE', 'status': 'ACTIVE',
'image': {'id': self.image.id}, 'image': {'id': self.image.id},
} }
self.server = compute_fakes.create_one_sdk_server(attrs=attrs) self.server = compute_fakes.create_one_server(attrs=attrs)
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.rebuild_server.return_value = self.server self.compute_client.rebuild_server.return_value = self.server
@ -6911,7 +6911,7 @@ class TestServerRebuildVolumeBacked(TestServer):
'status': 'ACTIVE', 'status': 'ACTIVE',
'image': '', 'image': '',
} }
self.server = compute_fakes.create_one_sdk_server(attrs=attrs) self.server = compute_fakes.create_one_server(attrs=attrs)
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.rebuild_server.return_value = self.server self.compute_client.rebuild_server.return_value = self.server
@ -7002,9 +7002,9 @@ class TestServerEvacuate(TestServer):
'networks': {}, 'networks': {},
'adminPass': 'passw0rd', 'adminPass': 'passw0rd',
} }
self.server = compute_fakes.create_one_sdk_server(attrs=attrs) self.server = compute_fakes.create_one_server(attrs=attrs)
attrs['id'] = self.server.id attrs['id'] = self.server.id
self.new_server = compute_fakes.create_one_sdk_server(attrs=attrs) self.new_server = compute_fakes.create_one_server(attrs=attrs)
# Return value for utils.find_resource for server. # Return value for utils.find_resource for server.
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
@ -7146,7 +7146,7 @@ class TestServerRemoveFixedIP(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
# Get the command object to test # Get the command object to test
self.cmd = server.RemoveFixedIP(self.app, None) self.cmd = server.RemoveFixedIP(self.app, None)
@ -7175,7 +7175,7 @@ class TestServerRescue(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.cmd = server.RescueServer(self.app, None) self.cmd = server.RescueServer(self.app, None)
@ -7255,7 +7255,7 @@ class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2):
super().setUp() super().setUp()
self.app.client_manager.network_endpoint_enabled = False self.app.client_manager.network_endpoint_enabled = False
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.cmd = server.RemoveFloatingIP(self.app, None) self.cmd = server.RemoveFloatingIP(self.app, None)
@ -7417,7 +7417,7 @@ class TestServerRemoveSecurityGroup(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.remove_security_group_from_server.return_value = ( self.compute_client.remove_security_group_from_server.return_value = (
None None
@ -7480,7 +7480,7 @@ class TestServerResize(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.flavor = compute_fakes.create_one_flavor() self.flavor = compute_fakes.create_one_flavor()
self.compute_client.find_flavor.return_value = self.flavor self.compute_client.find_flavor.return_value = self.flavor
@ -7688,7 +7688,7 @@ class TestServerResizeConfirm(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.confirm_server_resize.return_value = None self.compute_client.confirm_server_resize.return_value = None
@ -7720,7 +7720,7 @@ class TestServerMigrateConfirm(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.confirm_server_resize.return_value = None self.compute_client.confirm_server_resize.return_value = None
@ -7758,7 +7758,7 @@ class TestServerConfirmMigration(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.confirm_server_resize.return_value = None self.compute_client.confirm_server_resize.return_value = None
@ -7789,7 +7789,7 @@ class TestServerResizeRevert(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.revert_server_resize.return_value = None self.compute_client.revert_server_resize.return_value = None
@ -7821,7 +7821,7 @@ class TestServerMigrateRevert(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.revert_server_resize.return_value = None self.compute_client.revert_server_resize.return_value = None
@ -7859,7 +7859,7 @@ class TestServerRevertMigration(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.compute_client.revert_server_resize.return_value = None self.compute_client.revert_server_resize.return_value = None
@ -7918,7 +7918,7 @@ class TestServerSet(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
# Get the command object to test # Get the command object to test
@ -8300,7 +8300,7 @@ class TestServerShelve(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server( self.server = compute_fakes.create_one_server(
attrs={'status': 'ACTIVE'}, attrs={'status': 'ACTIVE'},
) )
@ -8434,7 +8434,7 @@ class TestServerShow(TestServer):
self.compute_client.get_server_diagnostics.return_value = { self.compute_client.get_server_diagnostics.return_value = {
'test': 'test' 'test': 'test'
} }
self.server = compute_fakes.create_one_sdk_server( self.server = compute_fakes.create_one_server(
attrs=server_info, attrs=server_info,
) )
self.server.fetch_topology = mock.MagicMock(return_value=self.topology) self.server.fetch_topology = mock.MagicMock(return_value=self.topology)
@ -8701,7 +8701,7 @@ class TestServerSsh(TestServer):
], ],
}, },
} }
self.server = compute_fakes.create_one_sdk_server( self.server = compute_fakes.create_one_server(
attrs=self.attrs, attrs=self.attrs,
) )
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
@ -8822,7 +8822,7 @@ class TestServerStart(TestServerAction):
self.run_method_with_sdk_servers('start_server', 3) self.run_method_with_sdk_servers('start_server', 3)
def test_server_start_with_all_projects(self): def test_server_start_with_all_projects(self):
server = compute_fakes.create_one_sdk_server() server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = server self.compute_client.find_server.return_value = server
arglist = [ arglist = [
@ -8858,7 +8858,7 @@ class TestServerStop(TestServerAction):
self.run_method_with_sdk_servers('stop_server', 3) self.run_method_with_sdk_servers('stop_server', 3)
def test_server_start_with_all_projects(self): def test_server_start_with_all_projects(self):
server = compute_fakes.create_one_sdk_server() server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = server self.compute_client.find_server.return_value = server
arglist = [ arglist = [
@ -8926,7 +8926,7 @@ class TestServerUnrescue(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.cmd = server.UnrescueServer(self.app, None) self.cmd = server.UnrescueServer(self.app, None)
@ -8955,7 +8955,7 @@ class TestServerUnset(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
# Get the command object to test # Get the command object to test
@ -9105,7 +9105,7 @@ class TestServerUnshelve(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server( self.server = compute_fakes.create_one_server(
attrs={'status': 'SHELVED'}, attrs={'status': 'SHELVED'},
) )
@ -9427,7 +9427,7 @@ class TestServerGeneral(TestServer):
'properties': '', 'properties': '',
'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}], 'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}],
} }
_server = compute_fakes.create_one_sdk_server(server_info) _server = compute_fakes.create_one_server(server_info)
self.compute_client.get_server.return_value = _server self.compute_client.get_server.return_value = _server
expected = { expected = {
@ -9514,7 +9514,7 @@ class TestServerGeneral(TestServer):
'properties': '', 'properties': '',
'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}], 'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}],
} }
_server = compute_fakes.create_one_sdk_server(server_info) _server = compute_fakes.create_one_server(server_info)
self.compute_client.get_server.return_value = _server self.compute_client.get_server.return_value = _server
expected = { expected = {

2
openstackclient/tests/unit/compute/v2/test_server_backup.py
View File

@ -50,7 +50,7 @@ class TestServerBackupCreate(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.image = image_fakes.create_one_image( self.image = image_fakes.create_one_image(

4
openstackclient/tests/unit/compute/v2/test_server_event.py
View File

@ -22,7 +22,7 @@ from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
class TestListServerEvent(compute_fakes.TestComputev2): class TestListServerEvent(compute_fakes.TestComputev2):
fake_server = compute_fakes.create_one_sdk_server() fake_server = compute_fakes.create_one_server()
fake_event = compute_fakes.create_one_server_action() fake_event = compute_fakes.create_one_server_action()
columns = ( columns = (
@ -366,7 +366,7 @@ class TestListServerEvent(compute_fakes.TestComputev2):
class TestShowServerEvent(compute_fakes.TestComputev2): class TestShowServerEvent(compute_fakes.TestComputev2):
fake_server = compute_fakes.create_one_sdk_server() fake_server = compute_fakes.create_one_server()
fake_event = compute_fakes.create_one_server_action() fake_event = compute_fakes.create_one_server_action()
columns = ( columns = (
'action', 'action',

2
openstackclient/tests/unit/compute/v2/test_server_image.py
View File

@ -49,7 +49,7 @@ class TestServerImageCreate(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
self.image = image_fakes.create_one_image( self.image = image_fakes.create_one_image(

8
openstackclient/tests/unit/compute/v2/test_server_migration.py
View File

@ -52,7 +52,7 @@ class TestListMigration(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_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.migrations = compute_fakes.create_migrations(count=3)
@ -694,7 +694,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
self.compute_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.server_migration = compute_fakes.create_one_server_migration()
@ -897,7 +897,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
# Return value for utils.find_resource for server. # Return value for utils.find_resource for server.
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server
@ -1012,7 +1012,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server() self.server = compute_fakes.create_one_server()
# Return value for utils.find_resource for server. # Return value for utils.find_resource for server.
self.compute_client.find_server.return_value = self.server self.compute_client.find_server.return_value = self.server

2
openstackclient/tests/unit/network/v2/test_port.py
View File

@ -1377,7 +1377,7 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
self.assertCountEqual(self.data, list(data)) self.assertCountEqual(self.data, list(data))
def test_port_list_with_server_option(self): def test_port_list_with_server_option(self):
fake_server = compute_fakes.create_one_sdk_server() fake_server = compute_fakes.create_one_server()
self.compute_client.find_server.return_value = fake_server self.compute_client.find_server.return_value = fake_server
arglist = [ arglist = [

2
openstackclient/tests/unit/volume/v3/test_volume_attachment.py
View File

@ -28,7 +28,7 @@ class TestVolumeAttachment(volume_fakes.TestVolume):
class TestVolumeAttachmentCreate(TestVolumeAttachment): class TestVolumeAttachmentCreate(TestVolumeAttachment):
volume = volume_fakes.create_one_volume() volume = volume_fakes.create_one_volume()
server = compute_fakes.create_one_sdk_server() server = compute_fakes.create_one_server()
volume_attachment = volume_fakes.create_one_volume_attachment( volume_attachment = volume_fakes.create_one_volume_attachment(
attrs={'instance': server.id, 'volume_id': volume.id}, attrs={'instance': server.id, 'volume_id': volume.id},
) )