Add status column for "openstack image list"

Actually, the status column is useful for the user.
So, it`s better to output this info by default (or, user had
to specify the extra option, i.e. --long).

Change-Id: Id2a9f86f0de5310f8f5ff9a46bf1b7411094b519
Closes-Bug: #1519181

4 files changed, 36 insertions, 20 deletions

diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 35e9ef43..4ebc8f93 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -354,7 +354,12 @@ class ListImage(lister.Lister):
             kwargs['public'] = True
         if parsed_args.private:
             kwargs['private'] = True
-        kwargs['detailed'] = bool(parsed_args.property or parsed_args.long)
+        # Note: We specifically need to do that below to get the 'status'
+        #       column.
+        #
+        # Always set kwargs['detailed'] to True, and then filter the columns
+        # according to whether the --long option is specified or not.
+        kwargs['detailed'] = True
 
         if parsed_args.long:
             columns = (
@@ -382,7 +387,7 @@ class ListImage(lister.Lister):
                 'Properties',
             )
         else:
-            columns = ("ID", "Name")
+            columns = ("ID", "Name", "Status")
             column_headers = columns
 
         # List of image data received
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 5552f033..c0fb5b58 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -417,7 +417,7 @@ class ListImage(lister.Lister):
                 'Tags',
             )
         else:
-            columns = ("ID", "Name")
+            columns = ("ID", "Name", "Status")
             column_headers = columns
 
         # List of image data received
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index d10d3b15..4d964bdb 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -261,16 +261,17 @@ class TestImageList(TestImage):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
-            detailed=False,
+            detailed=True,
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -288,17 +289,18 @@ class TestImageList(TestImage):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
-            detailed=False,
+            detailed=True,
             public=True,
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -316,17 +318,18 @@ class TestImageList(TestImage):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
-            detailed=False,
+            detailed=True,
             private=True,
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -401,12 +404,13 @@ class TestImageList(TestImage):
             property_field='properties',
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(columns, collist)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -423,7 +427,7 @@ class TestImageList(TestImage):
         # DisplayCommandBase.take_action() returns two tuples
         columns, data = self.cmd.take_action(parsed_args)
         self.api_mock.image_list.assert_called_with(
-            detailed=False,
+            detailed=True,
             marker=image_fakes.image_id,
         )
         si_mock.assert_called_with(
@@ -431,12 +435,13 @@ class TestImageList(TestImage):
             'name:asc'
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
-            image_fakes.image_name
+            image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index f71407a6..be73c4ca 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -374,12 +374,13 @@ class TestImageList(TestImage):
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -402,12 +403,13 @@ class TestImageList(TestImage):
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -430,12 +432,13 @@ class TestImageList(TestImage):
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -458,12 +461,13 @@ class TestImageList(TestImage):
             marker=image_fakes.image_id,
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(columns, collist)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -536,12 +540,13 @@ class TestImageList(TestImage):
             property_field='properties',
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(columns, collist)
         datalist = ((
             image_fakes.image_id,
             image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -565,12 +570,13 @@ class TestImageList(TestImage):
             'name:asc'
         )
 
-        collist = ('ID', 'Name')
+        collist = ('ID', 'Name', 'Status')
 
         self.assertEqual(collist, columns)
         datalist = ((
             image_fakes.image_id,
-            image_fakes.image_name
+            image_fakes.image_name,
+            '',
         ), )
         self.assertEqual(datalist, tuple(data))