diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 20:29:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 20:29:07 +0000 |
| commit | 18a7d23a8ab12aa29a13f441cd8608ea5138f420 (patch) | |
| tree | 160bdccfd6502f1ff94db51f4301754ecf73a974 /openstackclient/object | |
| parent | eab508fddd671b8946094335b93e3ae9db493e29 (diff) | |
| parent | 1f8b81462826284068b96ffce2648344c9e7c644 (diff) | |
| download | python-openstackclient-18a7d23a8ab12aa29a13f441cd8608ea5138f420.tar.gz | |
Merge "Fix up object-store show commands"
Diffstat (limited to 'openstackclient/object')
| -rw-r--r-- | openstackclient/object/v1/account.py | 2 | ||||
| -rw-r--r-- | openstackclient/object/v1/container.py | 2 | ||||
| -rw-r--r-- | openstackclient/object/v1/object.py | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py index 4ff890ce..aa94ff5c 100644 --- a/openstackclient/object/v1/account.py +++ b/openstackclient/object/v1/account.py @@ -55,6 +55,8 @@ class ShowAccount(show.ShowOne): @utils.log_method(log) 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')) return zip(*sorted(six.iteritems(data))) diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py index b8eb4c25..8c8844e2 100644 --- a/openstackclient/object/v1/container.py +++ b/openstackclient/object/v1/container.py @@ -229,6 +229,8 @@ class ShowContainer(show.ShowOne): data = self.app.client_manager.object_store.container_show( container=parsed_args.container, ) + if 'properties' in data: + data['properties'] = utils.format_dict(data.pop('properties')) return zip(*sorted(six.iteritems(data))) diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py index a023e3a0..4bd06124 100644 --- a/openstackclient/object/v1/object.py +++ b/openstackclient/object/v1/object.py @@ -284,6 +284,8 @@ class ShowObject(show.ShowOne): container=parsed_args.container, object=parsed_args.object, ) + if 'properties' in data: + data['properties'] = utils.format_dict(data.pop('properties')) return zip(*sorted(six.iteritems(data))) |