openstack/python-troveclient
Code Issues Proposed changes

Merge "Fix CLI output of datastore-show"

Browse Source
This commit is contained in:
Jenkins
2016-06-13 12:20:55 +00:00
committed by Gerrit Code Review
parent 047773c29d c0682f5649
commit 253e257757
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
troveclient/v1/shell.py
View File

@@ -1214,10 +1214,19 @@ def do_datastore_list(cs, args):
def do_datastore_show(cs, args): def do_datastore_show(cs, args):
"""Shows details of a datastore.""" """Shows details of a datastore."""
datastore = cs.datastores.get(args.datastore) datastore = cs.datastores.get(args.datastore)
info = datastore._info.copy()
versions = info.get('versions', [])
versions_str = "\n".join(
[ver['name'] + " (" + ver['id'] + ")" for ver in versions])
info['versions (id)'] = versions_str
info.pop('versions', None)
info.pop('links', None)
if hasattr(datastore, 'default_version'): if hasattr(datastore, 'default_version'):
datastore._info['default_version'] = getattr(datastore, def_ver_id = getattr(datastore, 'default_version')
'default_version') info['default_version'] = [
_print_object(datastore) ver['name'] for ver in versions if ver['id'] == def_ver_id][0]
utils.print_dict(info)
@utils.arg('datastore', metavar='<datastore>', @utils.arg('datastore', metavar='<datastore>',