From a9ef1724968b78ed20928f2cd58cc892d5e838c1 Mon Sep 17 00:00:00 2001 From: amcrn Date: Sun, 12 Jan 2014 15:07:05 -0800 Subject: [PATCH] Datastore on Show Instance Should Not Be a Dict From: +-----------+-----------------------------------------------+ | Property | Value | +-----------+-----------------------------------------------+ | created | 2014-01-12T22:17:16 | | datastore | {u'version': u'mysql-5.5', u'type': u'mysql'} | To: $ trove show 160e571f-afae-4ac8-aec0-7b2e55846e07 +-------------------+--------------------------------------+ | Property | Value | +-------------------+--------------------------------------+ | created | 2014-01-12T22:17:16 | | datastore | mysql | | datastore_version | mysql-5.5 | Change-Id: I1542869760ab0010a2ada4ed16a0b526dc233220 Closes-Bug: #1254141 --- troveclient/v1/shell.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py index 9bb7a345..cd2b1c91 100644 --- a/troveclient/v1/shell.py +++ b/troveclient/v1/shell.py @@ -119,6 +119,9 @@ def do_show(cs, args): instance._info['volume'] = instance.volume['size'] if hasattr(instance, 'ip'): instance._info['ip'] = ', '.join(instance.ip) + if hasattr(instance, 'datastore'): + instance._info['datastore'] = instance.datastore['type'] + instance._info['datastore_version'] = instance.datastore['version'] _print_instance(instance)