Merge "Fix server image create"

Author: Jenkins

openstackclient/compute/v2/server.py

@@ -393,7 +393,7 @@ def get_parser(self, prog_name):
         parser = super(CreateServerImage, self).get_parser(prog_name)
         parser.add_argument(
             'server',
-            metavar='<server',
+            metavar='<server>',
             help='Server (name or ID)',
         )
         parser.add_argument(
@@ -421,15 +421,15 @@ def take_action(self, parsed_args):
         else:
             name = server.name
 
-        image = compute_client.servers.create_image(
+        image_id = compute_client.servers.create_image(
             server,
             name,
         )
 
         if parsed_args.wait:
             if utils.wait_for_status(
                 image_client.images.get,
-                image,
+                image_id,
                 callback=_show_progress,
             ):
                 sys.stdout.write('\n')
@@ -443,7 +443,7 @@ def take_action(self, parsed_args):
 
         image = utils.find_resource(
             image_client.images,
-            image.id,
+            image_id,
         )
 
         info = {}

openstackclient/tests/compute/v2/test_server.py

@@ -80,11 +80,7 @@ def setUp(self):
             loaded=True,
         )
 
-        self.servers_mock.create_image.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(image_fakes.IMAGE),
-            loaded=True,
-        )
+        self.servers_mock.create_image.return_value = image_fakes.image_id
 
         self.images_mock.get.return_value = fakes.FakeResource(
             None,