openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "compute: Address bug in shelve offload logic"

This commit is contained in:
Zuul 2023-12-05 18:15:08 +00:00 committed by Gerrit Code Review
parent 1da22d0de4 885f5912eb
commit 0ac2e2f630
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openstackclient/compute/v2/server.py
View File

@ -4416,6 +4416,7 @@ class ShelveServer(command.Command):
self.app.stdout.flush()
compute_client = self.app.client_manager.sdk_connection.compute
server_ids = []
for server in parsed_args.servers:
server_obj = compute_client.find_server(
@ -4425,6 +4426,8 @@ class ShelveServer(command.Command):
if server_obj.status.lower() in ('shelved', 'shelved_offloaded'):
continue
server_ids.append(server_obj.id)
compute_client.shelve_server(server_obj.id)
# if we don't have to wait, either because it was requested explicitly
@ -4432,54 +4435,51 @@ class ShelveServer(command.Command):
if not parsed_args.wait and not parsed_args.offload:
return
for server in parsed_args.servers:
for server_id in server_ids:
# We use osc-lib's wait_for_status since that allows for a callback
# TODO(stephenfin): We should wait for these in parallel using e.g.
# https://review.opendev.org/c/openstack/osc-lib/+/762503/
if not utils.wait_for_status(
compute_client.get_server,
server_obj.id,
server_id,
success_status=('shelved', 'shelved_offloaded'),
callback=_show_progress,
):
LOG.error(_('Error shelving server: %s'), server_obj.id)
LOG.error(_('Error shelving server: %s'), server_id)
self.app.stdout.write(
_('Error shelving server: %s\n') % server_obj.id
_('Error shelving server: %s\n') % server_id
)
raise SystemExit
if not parsed_args.offload:
return
for server in parsed_args.servers:
server_obj = compute_client.find_server(
server,
ignore_missing=False,
)
for server_id in server_ids:
server_obj = compute_client.get_server(server_id)
if server_obj.status.lower() == 'shelved_offloaded':
continue
compute_client.shelve_offload_server(server_obj.id)
compute_client.shelve_offload_server(server_id)
if not parsed_args.wait:
return
for server in parsed_args.servers:
for server_id in server_ids:
# We use osc-lib's wait_for_status since that allows for a callback
# TODO(stephenfin): We should wait for these in parallel using e.g.
# https://review.opendev.org/c/openstack/osc-lib/+/762503/
if not utils.wait_for_status(
compute_client.get_server,
server_obj.id,
server_id,
success_status=('shelved_offloaded',),
callback=_show_progress,
):
LOG.error(
_('Error offloading shelved server %s'),
server_obj.id,
server_id,
)
self.app.stdout.write(
_('Error offloading shelved server: %s\n') % server_obj.id
_('Error offloading shelved server: %s\n') % server_id
)
raise SystemExit

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

@ -8149,20 +8149,24 @@ class TestServerShelve(TestServer):
result = self.cmd.take_action(parsed_args)
self.assertIsNone(result)
# two calls - one to retrieve the server state before shelving and
# another to do this before offloading
self.compute_sdk_client.find_server.assert_has_calls(
[
mock.call(self.server.name, ignore_missing=False),
mock.call(self.server.name, ignore_missing=False),
]
# one call to retrieve to retrieve the server state before shelving
self.compute_sdk_client.find_server.assert_called_once_with(
self.server.name,
ignore_missing=False,
)
# one call to retrieve the server state before offloading
self.compute_sdk_client.get_server.assert_called_once_with(
self.server.id
)
# one call to shelve the server
self.compute_sdk_client.shelve_server.assert_called_with(
self.server.id
)
# one call to shelve offload the server
self.compute_sdk_client.shelve_offload_server.assert_called_once_with(
self.server.id,
)
# one call to wait for the shelve offload to complete
mock_wait_for_status.assert_called_once_with(
self.compute_sdk_client.get_server,
self.server.id,