Merge "Use the cliff framework's ShowOne as intended for show image."

Jenkins · openstack-gerrit · commit 1bb59c53ee81 · 2013-01-28T23:50:10.000Z
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
@@ -19,6 +19,7 @@
 
 from cliff import command
 from cliff import lister
+from cliff import show
 
 from glanceclient.common import utils as gc_utils
 from openstackclient.common import utils
@@ -35,12 +36,12 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "--page-size",
             metavar="<size>",
-            help="Number of images to request in each paginated request.",
-            )
+            help="Number of images to request in each paginated request.")
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
+
         image_client = self.app.client_manager.image
 
         kwargs = {}
@@ -50,11 +51,7 @@ def take_action(self, parsed_args):
         data = image_client.images.list(**kwargs)
         columns = ["ID", "Name"]
 
-        return (columns,
-                (utils.get_item_properties(
-                    s, columns,
-                    ) for s in data),
-                )
+        return (columns, (utils.get_item_properties(s, columns) for s in data))
 
 
 class SaveImage(command.Command):
@@ -68,26 +65,25 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "--file",
             metavar="<file>",
-            help="Local file to save downloaded image data to. "
-                "If this is not specified the image data will be "
-                "written to stdout.",
-            )
+            help="Local file to save downloaded image data "
+                 "to. If this is not specified the image "
+                 "data will be written to stdout.")
         parser.add_argument(
             "id",
             metavar="<image_id>",
-            help="ID of image to describe.",
-            )
+            help="ID of image to describe.")
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
-        image_client = self.app.client_manager.image
 
+        image_client = self.app.client_manager.image
         data = image_client.images.data(parsed_args.id)
+
         gc_utils.save_image(data, parsed_args.file)
 
 
-class ShowImage(command.Command):
+class ShowImage(show.ShowOne):
     """Show image command"""
 
     api = "image"
@@ -98,12 +94,13 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "id",
             metavar="<image_id>",
-            help="ID of image to describe.",
-            )
+            help="ID of image to describe.")
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
+
         image_client = self.app.client_manager.image
+        data = image_client.images.get(parsed_args.id)
 
-        gc_utils.print_dict(image_client.images.get(parsed_args.id))
+        return zip(*sorted(data.iteritems()))
