Merge "cinder list now prints dash '-' when data is None"

2 files changed, 17 insertions, 0 deletions

diff --git a/cinderclient/tests/test_utils.py b/cinderclient/tests/test_utils.py
index 1ba9e5f..cf2518f 100644
--- a/cinderclient/tests/test_utils.py
+++ b/cinderclient/tests/test_utils.py
@@ -123,6 +123,21 @@ class PrintListTestCase(test_utils.TestCase):
 +---+---+
 """, cso.read())
 
+    def test_print_list_with_None_data(self):
+        Row = collections.namedtuple('Row', ['a', 'b'])
+        to_print = [Row(a=3, b=None), Row(a=1, b=2)]
+        with CaptureStdout() as cso:
+            utils.print_list(to_print, ['a', 'b'])
+        # Output should be sorted by the first key (a)
+        self.assertEqual("""\
++---+---+
+| a | b |
++---+---+
+| 1 | 2 |
+| 3 | - |
++---+---+
+""", cso.read())
+
     def test_print_list_with_list_sortby(self):
         Row = collections.namedtuple('Row', ['a', 'b'])
         to_print = [Row(a=4, b=3), Row(a=2, b=1)]
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index fcf9f68..330d52d 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -139,6 +139,8 @@ def print_list(objs, fields, formatters=None, sortby_index=0):
                     data = o[field]
                 else:
                     data = getattr(o, field_name, '')
+                if data is None:
+                    data = '-'
                 row.append(data)
         pt.add_row(row)