From bcd0a35ba067091d27e0f21e38e92a1ee61f406f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 27 Mar 2013 16:07:56 +1300 Subject: [PATCH] Display resource metadata as indented json displaying as a pretty table wasn't pretty. Change-Id: Ia25dd7d08b46b6b497f13707430664718f01d1cc Fixes: bug #1160689 --- heatclient/v1/resources.py | 3 ++- heatclient/v1/shell.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heatclient/v1/resources.py b/heatclient/v1/resources.py index f00e65f6..d692e515 100644 --- a/heatclient/v1/resources.py +++ b/heatclient/v1/resources.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import json from heatclient.common import base from heatclient.v1 import stacks import heatclient.exc as exc @@ -67,4 +68,4 @@ class ResourceManager(stacks.StackChildManager): resp, body = self.api.json_request('GET', '/stacks/%s/resources/%s/metadata' % (stack_id, resource_name)) - return Resource(self, body['metadata']) + return body['metadata'] diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 82e86b7f..9d7f0b46 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -291,13 +291,12 @@ def do_resource_metadata(hc, args): fields = {'stack_id': args.id, 'resource_name': args.resource} try: - resource = hc.resources.metadata(**fields) + metadata = hc.resources.metadata(**fields) except exc.HTTPNotFound: raise exc.CommandError('Stack or resource not found: %s %s' % (args.id, args.resource)) else: - formatters = {} - utils.print_dict(resource.to_dict(), formatters=formatters) + print json.dumps(metadata, indent=2) @utils.arg('id', metavar='',