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

Author: Jenkins

openstackclient/compute/v2/server.py

@@ -562,7 +562,7 @@ def take_action(self, parsed_args):
             else:
                 self.log.error(_('Error creating server: %s'),
                                parsed_args.server_name)
-                sys.stdout.write(_('\nError creating server'))
+                sys.stdout.write(_('Error creating server\n'))
                 raise SystemExit
 
         details = _prep_server_detail(compute_client, server)
@@ -646,7 +646,7 @@ def take_action(self, parsed_args):
             else:
                 self.log.error(_('Error creating snapshot of server: %s'),
                                parsed_args.server)
-                sys.stdout.write(_('\nError creating server snapshot'))
+                sys.stdout.write(_('Error creating server snapshot\n'))
                 raise SystemExit
 
         image = _prep_image_detail(image_client, image_id)
@@ -688,7 +688,7 @@ def take_action(self, parsed_args):
                 else:
                     self.log.error(_('Error deleting server: %s'),
                                    server_obj.id)
-                    sys.stdout.write(_('\nError deleting server'))
+                    sys.stdout.write(_('Error deleting server\n'))
                     raise SystemExit
 
 
@@ -1013,7 +1013,9 @@ def take_action(self, parsed_args):
             ):
                 sys.stdout.write(_('Complete\n'))
             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
 
 
@@ -1085,9 +1087,11 @@ def take_action(self, parsed_args):
                 server.id,
                 callback=_show_progress,
             ):
-                sys.stdout.write(_('\nReboot complete\n'))
+                sys.stdout.write(_('Complete\n'))
             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
 
 
@@ -1136,9 +1140,11 @@ def take_action(self, parsed_args):
                 server.id,
                 callback=_show_progress,
             ):
-                sys.stdout.write(_('\nComplete\n'))
+                sys.stdout.write(_('Complete\n'))
             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
 
         details = _prep_server_detail(compute_client, server)
@@ -1290,7 +1296,9 @@ def take_action(self, parsed_args):
                 ):
                     sys.stdout.write(_('Complete\n'))
                 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
         elif parsed_args.confirm:
             compute_client.servers.confirm_resize(server)