openstack/python-openstackclient
Code Issues Proposed changes

Use CommandError, not SystemExit, to exit

Browse Source 
Change-Id: Id2bcc18420b17cf3afed5584ef5104c3ef413830
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2023-11-15 11:26:31 +00:00
parent 885f5912eb
commit 432698fea2
2 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1987,9 +1987,10 @@ class CreateServer(command.ShowOne):
): ):
self.app.stdout.write('\n') self.app.stdout.write('\n')
else: else:
LOG.error('Error creating server: %s', parsed_args.server_name) msg = (
self.app.stdout.write(_('Error creating server\n')) _('Error unshelving server: %s') % parsed_args.server_name
raise SystemExit )
raise exceptions.CommandError(msg)
details = _prep_server_detail(compute_client, image_client, server) details = _prep_server_detail(compute_client, image_client, server)
return zip(*sorted(details.items())) return zip(*sorted(details.items()))
@@ -2081,10 +2082,8 @@ class DeleteServer(command.Command):
server_obj.id, server_obj.id,
callback=_show_progress, callback=_show_progress,
): ):
msg = _('Error deleting server: %s') msg = _('Error deleting server: %s') % server_obj.id
LOG.error(msg, server_obj.id) raise exceptions.CommandError(msg)
self.app.stdout.write(_('Error deleting server\n'))
raise SystemExit
def percent_type(x): def percent_type(x):
@@ -3110,9 +3109,8 @@ revert to release the new server and restart the old one."""
): ):
self.app.stdout.write(_('Complete\n')) self.app.stdout.write(_('Complete\n'))
else: else:
LOG.error(_('Error migrating server: %s'), server.id) msg = _('Error migrating server: %s') % server.id
self.app.stdout.write(_('Error migrating server\n')) raise exceptions.CommandError(msg)
raise SystemExit
class PauseServer(command.Command): class PauseServer(command.Command):
@@ -3194,9 +3192,8 @@ class RebootServer(command.Command):
): ):
self.app.stdout.write(_('Complete\n')) self.app.stdout.write(_('Complete\n'))
else: else:
LOG.error(_('Error rebooting server: %s'), server_id) msg = _('Error rebooting server: %s') % server_id
self.app.stdout.write(_('Error rebooting server\n')) raise exceptions.CommandError(msg)
raise SystemExit
class RebuildServer(command.ShowOne): class RebuildServer(command.ShowOne):
@@ -3566,9 +3563,8 @@ class RebuildServer(command.ShowOne):
): ):
self.app.stdout.write(_('Complete\n')) self.app.stdout.write(_('Complete\n'))
else: else:
LOG.error(_('Error rebuilding server: %s'), server.id) msg = _('Error rebuilding server: %s') % server.id
self.app.stdout.write(_('Error rebuilding server\n')) raise exceptions.CommandError(msg)
raise SystemExit
details = _prep_server_detail( details = _prep_server_detail(
compute_client, image_client, server, refresh=False compute_client, image_client, server, refresh=False
@@ -3689,9 +3685,8 @@ host."""
): ):
self.app.stdout.write(_('Complete\n')) self.app.stdout.write(_('Complete\n'))
else: else:
LOG.error(_('Error evacuating server: %s'), server.id) msg = _('Error evacuating server: %s') % server.id
self.app.stdout.write(_('Error evacuating server\n')) raise exceptions.CommandError(msg)
raise SystemExit
details = _prep_server_detail( details = _prep_server_detail(
compute_client, image_client, server, refresh=True compute_client, image_client, server, refresh=True
@@ -4042,9 +4037,8 @@ release the new server and restart the old one."""
): ):
self.app.stdout.write(_('Complete\n')) self.app.stdout.write(_('Complete\n'))
else: else:
LOG.error(_('Error resizing server: %s'), server.id) msg = _('Error resizing server: %s') % server.id
self.app.stdout.write(_('Error resizing server\n')) raise exceptions.CommandError(msg)
raise SystemExit
elif parsed_args.confirm: elif parsed_args.confirm:
self.log.warning( self.log.warning(
_( _(
@@ -4445,11 +4439,8 @@ class ShelveServer(command.Command):
success_status=('shelved', 'shelved_offloaded'), success_status=('shelved', 'shelved_offloaded'),
callback=_show_progress, callback=_show_progress,
): ):
LOG.error(_('Error shelving server: %s'), server_id) msg = _('Error shelving server: %s') % server_id
self.app.stdout.write( raise exceptions.CommandError(msg)
_('Error shelving server: %s\n') % server_id
)
raise SystemExit
if not parsed_args.offload: if not parsed_args.offload:
return return
@@ -4474,14 +4465,8 @@ class ShelveServer(command.Command):
success_status=('shelved_offloaded',), success_status=('shelved_offloaded',),
callback=_show_progress, callback=_show_progress,
): ):
LOG.error( msg = _('Error offloading shelved server: %s') % server_id
_('Error offloading shelved server %s'), raise exceptions.CommandError(msg)
server_id,
)
self.app.stdout.write(
_('Error offloading shelved server: %s\n') % server_id
)
raise SystemExit
class ShowServer(command.ShowOne): class ShowServer(command.ShowOne):
@@ -5073,8 +5058,5 @@ class UnshelveServer(command.Command):
success_status=('active', 'shutoff'), success_status=('active', 'shutoff'),
callback=_show_progress, callback=_show_progress,
): ):
LOG.error(_('Error unshelving server %s'), server_obj.id) msg = _('Error unshelving server: %s') % server_obj.id
self.app.stdout.write( raise exceptions.CommandError(msg)
_('Error unshelving server: %s\n') % server_obj.id
)
raise SystemExit

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

@@ -2327,7 +2327,9 @@ class TestServerCreate(TestServer):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
mock_wait_for_status.assert_called_once_with( mock_wait_for_status.assert_called_once_with(
self.servers_mock.get, self.servers_mock.get,
@@ -4569,7 +4571,9 @@ class TestServerDelete(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
self.servers_mock.delete.assert_called_with(servers[0].id) self.servers_mock.delete.assert_called_with(servers[0].id)
mock_wait_for_delete.assert_called_once_with( mock_wait_for_delete.assert_called_once_with(
@@ -5984,7 +5988,9 @@ class TestServerMigrate(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
self.servers_mock.get.assert_called_with(self.server.id) self.servers_mock.get.assert_called_with(self.server.id)
self.server.migrate.assert_called_with() self.server.migrate.assert_called_with()
@@ -6090,9 +6096,10 @@ class TestServerReboot(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
self.assertIn('Error rebooting server', mock_log.call_args[0][0])
self.compute_sdk_client.reboot_server.assert_called_once_with( self.compute_sdk_client.reboot_server.assert_called_once_with(
servers[0].id, servers[0].id,
'SOFT', 'SOFT',
@@ -6351,7 +6358,9 @@ class TestServerRebuild(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
mock_wait_for_status.assert_called_once_with( mock_wait_for_status.assert_called_once_with(
self.servers_mock.get, self.servers_mock.get,
@@ -7519,7 +7528,9 @@ class TestServerResize(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(
exceptions.CommandError, self.cmd.take_action, parsed_args
)
self.servers_mock.get.assert_called_with( self.servers_mock.get.assert_called_with(
self.server.id, self.server.id,