summaryrefslogtreecommitdiff
path: root/cinderclient/v2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-24 18:32:35 +0000
committerGerrit Code Review <review@openstack.org>2016-02-24 18:32:35 +0000
commit8155d453c85260f7c30cbd719ed65d674b8fb419 (patch)
tree8d8fa714b719f1c727563c5260630981af9bb57d /cinderclient/v2
parent8d1d4097002c4555f591faab7a6fb9eddaced205 (diff)
parenta26c1e67b674e20ccbe57e20fd591d8c3b545696 (diff)
downloadpython-cinderclient-8155d453c85260f7c30cbd719ed65d674b8fb419.tar.gz
Merge "Extra 'u' in output of cinder cli commands"
Diffstat (limited to 'cinderclient/v2')
-rw-r--r--cinderclient/v2/shell.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index 143d199..d1f78f4 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -293,7 +293,8 @@ def do_show(cs, args):
info.update(volume._info)
info.pop('links', None)
- utils.print_dict(info)
+ utils.print_dict(info,
+ formatters=['metadata', 'volume_image_metadata'])
class CheckSizeArgForCreate(argparse.Action):
@@ -1007,9 +1008,12 @@ def do_endpoints(cs, args):
def do_credentials(cs, args):
"""Shows user credentials returned from auth."""
catalog = cs.client.service_catalog.catalog
- utils.print_dict(catalog['user'], "User Credentials")
- utils.print_dict(catalog['token'], "Token")
+ # formatters defines field to be converted from unicode to string
+ utils.print_dict(catalog['user'], "User Credentials",
+ formatters=['domain', 'roles'])
+ utils.print_dict(catalog['token'], "Token",
+ formatters=['audit_ids', 'tenant'])
_quota_resources = ['volumes', 'snapshots', 'gigabytes',
'backups', 'backup_gigabytes',
@@ -1935,7 +1939,9 @@ def do_encryption_type_delete(cs, args):
def _print_qos_specs(qos_specs):
- utils.print_dict(qos_specs._info)
+
+ # formatters defines field to be converted from unicode to string
+ utils.print_dict(qos_specs._info, formatters=['specs'])
def _print_qos_specs_list(q_specs):