openstack/python-openstackclient
Code Issues Proposed changes

Remove TestServer base class

Browse Source 
Simplify this somewhat.

Change-Id: I4ece72344e0e671c2f190fa9200e91d72333e96d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2024-05-10 14:26:39 +01:00
parent 438e40db36
commit 0d89f01448
1 changed files with 115 additions and 105 deletions

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

@ -78,30 +78,6 @@ class TestServer(compute_fakes.TestComputev2):
return servers return servers
def setup_sdk_volumes_mock(self, count):
volumes = volume_fakes.create_sdk_volumes(count=count)
# This is the return value for volume_client.find_volume()
self.volume_sdk_client.find_volume.side_effect = volumes
return volumes
def run_method_with_sdk_servers(self, method_name, server_count):
servers = self.setup_sdk_servers_mock(count=server_count)
arglist = [s.id for s in servers]
verifylist = [
('server', arglist),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args)
calls = [mock.call(s.id) for s in servers]
method = getattr(self.compute_sdk_client, method_name)
method.assert_has_calls(calls)
self.assertIsNone(result)
class TestServerAddFixedIP(TestServer): class TestServerAddFixedIP(TestServer):
def setUp(self): def setUp(self):
@ -730,12 +706,15 @@ class TestServerVolume(TestServer):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.servers = self.setup_sdk_servers_mock(count=1) self.server = compute_fakes.create_one_sdk_server()
self.volumes = self.setup_sdk_volumes_mock(count=1) self.compute_sdk_client.find_server.return_value = self.server
self.volume = volume_fakes.create_one_sdk_volume()
self.volume_sdk_client.find_volume.return_value = self.volume
attrs = { attrs = {
'server_id': self.servers[0].id, 'server_id': self.server.id,
'volume_id': self.volumes[0].id, 'volume_id': self.volume.id,
} }
self.volume_attachment = compute_fakes.create_one_volume_attachment( self.volume_attachment = compute_fakes.create_one_volume_attachment(
attrs=attrs attrs=attrs
@ -758,12 +737,12 @@ class TestServerAddVolume(TestServerVolume):
arglist = [ arglist = [
'--device', '--device',
'/dev/sdb', '/dev/sdb',
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('device', '/dev/sdb'), ('device', '/dev/sdb'),
] ]
@ -782,7 +761,7 @@ class TestServerAddVolume(TestServerVolume):
self.assertEqual(expected_columns, columns) self.assertEqual(expected_columns, columns)
self.assertEqual(expected_data, data) self.assertEqual(expected_data, data)
self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb' self.server, volumeId=self.volume.id, device='/dev/sdb'
) )
def test_server_add_volume_with_tag(self): def test_server_add_volume_with_tag(self):
@ -793,12 +772,12 @@ class TestServerAddVolume(TestServerVolume):
'/dev/sdb', '/dev/sdb',
'--tag', '--tag',
'foo', 'foo',
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('device', '/dev/sdb'), ('device', '/dev/sdb'),
('tag', 'foo'), ('tag', 'foo'),
] ]
@ -819,8 +798,8 @@ class TestServerAddVolume(TestServerVolume):
self.assertEqual(expected_columns, columns) self.assertEqual(expected_columns, columns)
self.assertEqual(expected_data, data) self.assertEqual(expected_data, data)
self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
self.servers[0], self.server,
volumeId=self.volumes[0].id, volumeId=self.volume.id,
device='/dev/sdb', device='/dev/sdb',
tag='foo', tag='foo',
) )
@ -829,14 +808,14 @@ class TestServerAddVolume(TestServerVolume):
self.set_compute_api_version('2.48') self.set_compute_api_version('2.48')
arglist = [ arglist = [
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
'--tag', '--tag',
'foo', 'foo',
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('tag', 'foo'), ('tag', 'foo'),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -856,13 +835,13 @@ class TestServerAddVolume(TestServerVolume):
'--enable-delete-on-termination', '--enable-delete-on-termination',
'--device', '--device',
'/dev/sdb', '/dev/sdb',
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('device', '/dev/sdb'), ('device', '/dev/sdb'),
('enable_delete_on_termination', True), ('enable_delete_on_termination', True),
] ]
@ -889,8 +868,8 @@ class TestServerAddVolume(TestServerVolume):
self.assertEqual(expected_columns, columns) self.assertEqual(expected_columns, columns)
self.assertEqual(expected_data, data) self.assertEqual(expected_data, data)
self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
self.servers[0], self.server,
volumeId=self.volumes[0].id, volumeId=self.volume.id,
device='/dev/sdb', device='/dev/sdb',
delete_on_termination=True, delete_on_termination=True,
) )
@ -904,13 +883,13 @@ class TestServerAddVolume(TestServerVolume):
'--disable-delete-on-termination', '--disable-delete-on-termination',
'--device', '--device',
'/dev/sdb', '/dev/sdb',
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('device', '/dev/sdb'), ('device', '/dev/sdb'),
('disable_delete_on_termination', True), ('disable_delete_on_termination', True),
] ]
@ -938,8 +917,8 @@ class TestServerAddVolume(TestServerVolume):
self.assertEqual(expected_columns, columns) self.assertEqual(expected_columns, columns)
self.assertEqual(expected_data, data) self.assertEqual(expected_data, data)
self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.compute_sdk_client.create_volume_attachment.assert_called_once_with(
self.servers[0], self.server,
volumeId=self.volumes[0].id, volumeId=self.volume.id,
device='/dev/sdb', device='/dev/sdb',
delete_on_termination=False, delete_on_termination=False,
) )
@ -950,13 +929,13 @@ class TestServerAddVolume(TestServerVolume):
self.set_compute_api_version('2.78') self.set_compute_api_version('2.78')
arglist = [ arglist = [
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
'--enable-delete-on-termination', '--enable-delete-on-termination',
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('enable_delete_on_termination', True), ('enable_delete_on_termination', True),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -974,13 +953,13 @@ class TestServerAddVolume(TestServerVolume):
self.set_compute_api_version('2.78') self.set_compute_api_version('2.78')
arglist = [ arglist = [
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
'--disable-delete-on-termination', '--disable-delete-on-termination',
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('disable_delete_on_termination', True), ('disable_delete_on_termination', True),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -1002,13 +981,13 @@ class TestServerAddVolume(TestServerVolume):
'--disable-delete-on-termination', '--disable-delete-on-termination',
'--device', '--device',
'/dev/sdb', '/dev/sdb',
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
('device', '/dev/sdb'), ('device', '/dev/sdb'),
('enable_delete_on_termination', True), ('enable_delete_on_termination', True),
('disable_delete_on_termination', True), ('disable_delete_on_termination', True),
@ -1036,13 +1015,13 @@ class TestServerRemoveVolume(TestServerVolume):
def test_server_remove_volume(self): def test_server_remove_volume(self):
arglist = [ arglist = [
self.servers[0].id, self.server.id,
self.volumes[0].id, self.volume.id,
] ]
verifylist = [ verifylist = [
('server', self.servers[0].id), ('server', self.server.id),
('volume', self.volumes[0].id), ('volume', self.volume.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -1051,8 +1030,8 @@ class TestServerRemoveVolume(TestServerVolume):
self.assertIsNone(result) self.assertIsNone(result)
self.compute_sdk_client.delete_volume_attachment.assert_called_once_with( self.compute_sdk_client.delete_volume_attachment.assert_called_once_with(
self.volumes[0], self.volume,
self.servers[0], self.server,
ignore_missing=False, ignore_missing=False,
) )
@ -5476,15 +5455,29 @@ class TestServerListV273(_TestServerList):
self.assertEqual(expected_row, partial_server) self.assertEqual(expected_row, partial_server)
class TestServerLock(TestServer): class TestServerAction(compute_fakes.TestComputev2):
def run_method_with_sdk_servers(self, method_name, server_count):
servers = compute_fakes.create_sdk_servers(count=server_count)
self.compute_sdk_client.find_server.side_effect = servers
arglist = [s.id for s in servers]
verifylist = [
('server', arglist),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args)
calls = [mock.call(s.id) for s in servers]
method = getattr(self.compute_sdk_client, method_name)
method.assert_has_calls(calls)
self.assertIsNone(result)
class TestServerLock(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.server = compute_fakes.create_one_sdk_server()
self.compute_sdk_client.find_server.return_value = self.server
self.compute_sdk_client.lock_server.return_value = None
# Get the command object to test # Get the command object to test
self.cmd = server.LockServer(self.app, None) self.cmd = server.LockServer(self.app, None)
@ -5497,6 +5490,10 @@ class TestServerLock(TestServer):
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.compute_sdk_client.find_server.return_value = self.server
self.compute_sdk_client.lock_server.return_value = None
arglist = [ arglist = [
self.server.id, self.server.id,
'--reason', '--reason',
@ -5506,8 +5503,10 @@ class TestServerLock(TestServer):
('server', [self.server.id]), ('server', [self.server.id]),
('reason', 'blah'), ('reason', 'blah'),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.compute_sdk_client.find_server.assert_called_with( self.compute_sdk_client.find_server.assert_called_with(
self.server.id, self.server.id,
ignore_missing=False, ignore_missing=False,
@ -5520,30 +5519,38 @@ class TestServerLock(TestServer):
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')
server2 = compute_fakes.create_one_sdk_server() server_a = compute_fakes.create_one_sdk_server()
server_b = compute_fakes.create_one_sdk_server()
self.compute_sdk_client.find_server.side_effect = [server_a, server_b]
self.compute_sdk_client.lock_server.return_value = None
arglist = [ arglist = [
self.server.id, server_a.id,
server2.id, server_b.id,
'--reason', '--reason',
'choo..choo', 'choo..choo',
] ]
verifylist = [ verifylist = [
('server', [self.server.id, server2.id]), ('server', [server_a.id, server_b.id]),
('reason', 'choo..choo'), ('reason', 'choo..choo'),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.assertEqual(2, self.compute_sdk_client.find_server.call_count) self.assertEqual(2, self.compute_sdk_client.find_server.call_count)
self.compute_sdk_client.lock_server.assert_called_with( self.compute_sdk_client.lock_server.assert_has_calls(
self.server.id, [
locked_reason="choo..choo", mock.call(server_a.id, locked_reason="choo..choo"),
mock.call(server_b.id, locked_reason="choo..choo"),
]
) )
self.assertEqual(2, self.compute_sdk_client.lock_server.call_count)
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_sdk_server()
arglist = [ arglist = [
server.id, server.id,
'--reason', '--reason',
@ -5553,6 +5560,7 @@ class TestServerLock(TestServer):
('server', [server.id]), ('server', [server.id]),
('reason', "blah"), ('reason', "blah"),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
ex = self.assertRaises( ex = self.assertRaises(
exceptions.CommandError, exceptions.CommandError,
@ -6089,7 +6097,7 @@ class TestServerReboot(TestServer):
) )
class TestServerPause(TestServer): class TestServerPause(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -7869,7 +7877,7 @@ class TestServerRevertMigration(compute_fakes.TestComputev2):
self.assertIsNone(result) self.assertIsNone(result)
class TestServerRestore(TestServer): class TestServerRestore(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -7883,7 +7891,7 @@ class TestServerRestore(TestServer):
self.run_method_with_sdk_servers('restore_server', 3) self.run_method_with_sdk_servers('restore_server', 3)
class TestServerResume(TestServer): class TestServerResume(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -8752,7 +8760,7 @@ class TestServerSsh(TestServer):
) )
class TestServerStart(TestServer): class TestServerStart(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -8766,28 +8774,29 @@ class TestServerStart(TestServer):
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):
servers = self.setup_sdk_servers_mock(count=1) server = compute_fakes.create_one_sdk_server()
self.compute_sdk_client.find_server.return_value = server
arglist = [ arglist = [
servers[0].id, server.id,
'--all-projects', '--all-projects',
] ]
verifylist = [ verifylist = [
('server', [servers[0].id]), ('server', [server.id]),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.compute_sdk_client.find_server.assert_called_once_with( self.compute_sdk_client.find_server.assert_called_once_with(
servers[0].id, server.id,
ignore_missing=False, ignore_missing=False,
details=False, details=False,
all_projects=True, all_projects=True,
) )
class TestServerStop(TestServer): class TestServerStop(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -8801,28 +8810,29 @@ class TestServerStop(TestServer):
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):
servers = self.setup_sdk_servers_mock(count=1) server = compute_fakes.create_one_sdk_server()
self.compute_sdk_client.find_server.return_value = server
arglist = [ arglist = [
servers[0].id, server.id,
'--all-projects', '--all-projects',
] ]
verifylist = [ verifylist = [
('server', [servers[0].id]), ('server', [server.id]),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.compute_sdk_client.find_server.assert_called_once_with( self.compute_sdk_client.find_server.assert_called_once_with(
servers[0].id, server.id,
ignore_missing=False, ignore_missing=False,
details=False, details=False,
all_projects=True, all_projects=True,
) )
class TestServerSuspend(TestServer): class TestServerSuspend(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -8836,7 +8846,7 @@ class TestServerSuspend(TestServer):
self.run_method_with_sdk_servers('suspend_server', 3) self.run_method_with_sdk_servers('suspend_server', 3)
class TestServerUnlock(TestServer): class TestServerUnlock(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@ -8850,7 +8860,7 @@ class TestServerUnlock(TestServer):
self.run_method_with_sdk_servers('unlock_server', 3) self.run_method_with_sdk_servers('unlock_server', 3)
class TestServerUnpause(TestServer): class TestServerUnpause(TestServerAction):
def setUp(self): def setUp(self):
super().setUp() super().setUp()