openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix output and error log in server.py"

Browse Source
This commit is contained in:
Jenkins 2016-05-31 13:42:14 +00:00 committed by Gerrit Code Review
commit 21924f55b9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,7 +562,7 @@ class CreateServer(command.ShowOne):
else: else:
self.log.error(_('Error creating server: %s'), self.log.error(_('Error creating server: %s'),
parsed_args.server_name) parsed_args.server_name)
sys.stdout.write(_('\nError creating server')) sys.stdout.write(_('Error creating server\n'))
raise SystemExit raise SystemExit
details = _prep_server_detail(compute_client, server) details = _prep_server_detail(compute_client, server)
@ -646,7 +646,7 @@ class CreateServerImage(command.ShowOne):
else: else:
self.log.error(_('Error creating snapshot of server: %s'), self.log.error(_('Error creating snapshot of server: %s'),
parsed_args.server) parsed_args.server)
sys.stdout.write(_('\nError creating server snapshot')) sys.stdout.write(_('Error creating server snapshot\n'))
raise SystemExit raise SystemExit
image = _prep_image_detail(image_client, image_id) image = _prep_image_detail(image_client, image_id)
@ -688,7 +688,7 @@ class DeleteServer(command.Command):
else: else:
self.log.error(_('Error deleting server: %s'), self.log.error(_('Error deleting server: %s'),
server_obj.id) server_obj.id)
sys.stdout.write(_('\nError deleting server')) sys.stdout.write(_('Error deleting server\n'))
raise SystemExit raise SystemExit
@ -1013,7 +1013,9 @@ class MigrateServer(command.Command):
): ):
sys.stdout.write(_('Complete\n')) sys.stdout.write(_('Complete\n'))
else: else:
sys.stdout.write(_('\nError migrating server')) self.log.error(_('Error migrating server: %s'),
server.id)
sys.stdout.write(_('Error migrating server\n'))
raise SystemExit raise SystemExit
@ -1085,9 +1087,11 @@ class RebootServer(command.Command):
server.id, server.id,
callback=_show_progress, callback=_show_progress,
): ):
sys.stdout.write(_('\nReboot complete\n')) sys.stdout.write(_('Complete\n'))
else: else:
sys.stdout.write(_('\nError rebooting server\n')) self.log.error(_('Error rebooting server: %s'),
server.id)
sys.stdout.write(_('Error rebooting server\n'))
raise SystemExit raise SystemExit
@ -1136,9 +1140,11 @@ class RebuildServer(command.ShowOne):
server.id, server.id,
callback=_show_progress, callback=_show_progress,
): ):
sys.stdout.write(_('\nComplete\n')) sys.stdout.write(_('Complete\n'))
else: else:
sys.stdout.write(_('\nError rebuilding server')) self.log.error(_('Error rebuilding server: %s'),
server.id)
sys.stdout.write(_('Error rebuilding server\n'))
raise SystemExit raise SystemExit
details = _prep_server_detail(compute_client, server) details = _prep_server_detail(compute_client, server)
@ -1290,7 +1296,9 @@ class ResizeServer(command.Command):
): ):
sys.stdout.write(_('Complete\n')) sys.stdout.write(_('Complete\n'))
else: else:
sys.stdout.write(_('\nError resizing server')) self.log.error(_('Error resizing server: %s'),
server.id)
sys.stdout.write(_('Error resizing server\n'))
raise SystemExit raise SystemExit
elif parsed_args.confirm: elif parsed_args.confirm:
compute_client.servers.confirm_resize(server) compute_client.servers.confirm_resize(server)