diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-23 02:31:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-23 02:31:15 +0000 |
| commit | 34a92eebfad016d4c76f8fe8475043537d0c1ea9 (patch) | |
| tree | 5e687e8b9b3b7a11c0591babd3d464dec2814092 | |
| parent | 46ef850ce9f46c0650b1c4bbdd98c83df4b0554a (diff) | |
| parent | c2630ae91a0e4bae662926a0e45d71c79683b584 (diff) | |
| download | python-openstackclient-34a92eebfad016d4c76f8fe8475043537d0c1ea9.tar.gz | |
Merge "Use cliff formattable columns in object storage commands"
| -rw-r--r-- | openstackclient/object/v1/account.py | 5 | ||||
| -rw-r--r-- | openstackclient/object/v1/container.py | 3 | ||||
| -rw-r--r-- | openstackclient/object/v1/object.py | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py index 4847f8bb..95be8132 100644 --- 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 index 9f689ab6..02e8d277 100644 --- 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 @@ class ShowContainer(command.ShowOne): 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 index aeb02536..3747e19e 100644 --- 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 @@ class ShowObject(command.ShowOne): 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))) |