Use cliff formattable columns in object storage commands

amotoki · Dean Troyer · commit c2630ae91a0e · 2019-06-22T18:44:27.000Z
Partial-Bug: #1687955
Partially implement blueprint osc-formattable-columns

Change-Id: I65737561c9b5ef29f5878316d2ff89f3d538158f
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py
@@ -13,9 +13,9 @@
 
 """Account v1 action implementations"""
 
+from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
-from osc_lib import utils
 import six
 
 from openstackclient.i18n import _
@@ -48,7 +48,8 @@ class ShowAccount(command.ShowOne):
     def take_action(self, parsed_args):
         data = self.app.client_manager.object_store.account_show()
         if 'properties' in data:
-            data['properties'] = utils.format_dict(data.pop('properties'))
+            data['properties'] = format_columns.DictColumn(
+                data.pop('properties'))
         return zip(*sorted(six.iteritems(data)))
 
 
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
@@ -17,6 +17,7 @@
 
 import logging
 
+from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
@@ -230,7 +231,7 @@ def take_action(self, parsed_args):
             container=parsed_args.container,
         )
         if 'properties' in data:
-            data['properties'] = utils.format_dict(data.pop('properties'))
+            data['properties'] = format_columns.DictColumn(data['properties'])
 
         return zip(*sorted(six.iteritems(data)))
 
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
@@ -17,6 +17,7 @@
 
 import logging
 
+from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
@@ -284,7 +285,7 @@ def take_action(self, parsed_args):
             object=parsed_args.object,
         )
         if 'properties' in data:
-            data['properties'] = utils.format_dict(data.pop('properties'))
+            data['properties'] = format_columns.DictColumn(data['properties'])
 
         return zip(*sorted(six.iteritems(data)))
 
