openstack/python-heatclient
Code Issues Proposed changes

Merge "Be backward compatible after a renaming in API"

Browse Source
This commit is contained in:
Jenkins
2013-09-04 03:35:34 +00:00
committed by Gerrit Code Review
parent a7ffcd76d0 b95657fd15
commit e2cbb45036
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
heatclient/v1/shell.py
View File

@@ -333,8 +333,13 @@ def do_resource_list(hc, args):
except exc.HTTPNotFound: except exc.HTTPNotFound:
raise exc.CommandError('Stack not found: %s' % args.id) raise exc.CommandError('Stack not found: %s' % args.id)
else: else:
fields = ['resource_name', 'resource_type', fields = ['resource_type', 'resource_status', 'updated_time']
'resource_status', 'updated_time'] if len(resources) >= 1:
if hasattr(resources[0], 'resource_name'):
fields.insert(0, 'resource_name')
else:
fields.insert(0, 'logical_resource_id')
utils.print_list(resources, fields, sortby=3) utils.print_list(resources, fields, sortby=3)
@@ -416,8 +421,13 @@ def do_event_list(hc, args):
except exc.HTTPNotFound: except exc.HTTPNotFound:
raise exc.CommandError('Stack not found: %s' % args.id) raise exc.CommandError('Stack not found: %s' % args.id)
else: else:
fields = ['resource_name', 'id', 'resource_status_reason', fields = ['id', 'resource_status_reason',
'resource_status', 'event_time'] 'resource_status', 'event_time']
if len(events) >= 1:
if hasattr(events[0], 'resource_name'):
fields.insert(0, 'resource_name')
else:
fields.insert(0, 'logical_resource_id')
utils.print_list(events, fields) utils.print_list(events, fields)