Merge "To display image size in human friendly format"

2 files changed, 28 insertions, 1 deletions

diff --git a/openstackclient/tests/unit/image/v1/fakes.py b/openstackclient/tests/unit/image/v1/fakes.py
index 080356ee..4b6d278c 100644
--- a/openstackclient/tests/unit/image/v1/fakes.py
+++ b/openstackclient/tests/unit/image/v1/fakes.py
@@ -34,6 +34,7 @@ image_properties = {
 }
 image_properties_str = "Alpha='a', Beta='b', Gamma='g'"
 image_data = 'line 1\nline 2\n'
+image_size = 0
 
 IMAGE = {
     'id': image_id,
@@ -46,6 +47,7 @@ IMAGE = {
     'is_public': image_public,
     'protected': image_protected,
     'properties': image_properties,
+    'size': image_size,
 }
 
 IMAGE_columns = tuple(sorted(IMAGE))
diff --git a/openstackclient/tests/unit/image/v1/test_image.py b/openstackclient/tests/unit/image/v1/test_image.py
index 036c8336..41ddc49f 100644
--- a/openstackclient/tests/unit/image/v1/test_image.py
+++ b/openstackclient/tests/unit/image/v1/test_image.py
@@ -692,7 +692,8 @@ class TestImageSet(TestImage):
 
 class TestImageShow(TestImage):
 
-    _image = image_fakes.FakeImage.create_one_image()
+    _image = image_fakes.FakeImage.create_one_image(
+        attrs={'size': 2000})
     columns = (
         'container_format',
         'disk_format',
@@ -704,6 +705,7 @@ class TestImageShow(TestImage):
         'owner',
         'properties',
         'protected',
+        'size',
     )
     data = (
         _image.container_format,
@@ -716,6 +718,7 @@ class TestImageShow(TestImage):
         _image.owner,
         utils.format_dict(_image.properties),
         _image.protected,
+        _image.size,
     )
 
     def setUp(self):
@@ -745,3 +748,25 @@ class TestImageShow(TestImage):
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
+
+    def test_image_show_human_readable(self):
+        arglist = [
+            '--human-readable',
+            self._image.id,
+        ]
+        verifylist = [
+            ('human_readable', True),
+            ('image', self._image.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # In base command class ShowOne in cliff, abstract method take_action()
+        # returns a two-part tuple with a tuple of column names and a tuple of
+        # data to be shown.
+        columns, data = self.cmd.take_action(parsed_args)
+        self.images_mock.get.assert_called_with(
+            self._image.id,
+        )
+
+        size_index = columns.index('size')
+        self.assertEqual(data[size_index], '2K')