openstack
/
python-heatclient
Code Issues Proposed changes

Be backward compatible after a renaming in API 

The need was introduced with the renaming of field logical_resource_id
to resource_name, so let heatclient display the good one for the two
Heat versions.

Fixes bug #1216903

Change-Id: I3e86f482a1b814a27b15be3c102727c44153221f
changes/95/44295/1
Swann Croiset 2013-08-29 15:47:22 +02:00
parent a5d71080ef
commit b95657fd15
1 changed files with 13 additions and 3 deletions
Show Stats 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:
raise exc.CommandError('Stack not found: %s' % args.id)
else:
fields = ['resource_name', 'resource_type',
'resource_status', 'updated_time']
fields = ['resource_type', '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)
@ -416,8 +421,13 @@ def do_event_list(hc, args):
except exc.HTTPNotFound:
raise exc.CommandError('Stack not found: %s' % args.id)
else:
fields = ['resource_name', 'id', 'resource_status_reason',
fields = ['id', 'resource_status_reason',
'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)