Make logical_resource_id renaming backward compatible

The rename of logical_resource_id to resource_name changed the
return value of resource and event API. Adding a redundant
logical_resource_id back to make the change backward compatible.

Change-Id: I08ab00e38bae6e9bbaf8387dc01effaf776d0b3c
This commit is contained in:
Liang Chen 2013-08-27 13:05:05 +08:00
parent 4c1bfe32a5
commit 3117a96d45
3 changed files with 13 additions and 0 deletions

View File

@ -57,6 +57,9 @@ def format_event(req, event, keys=None):
# and RES_STATUS, so the API format doesn't expose the
# internal split of state into action/status
yield (key, '_'.join((event[engine_api.EVENT_RES_ACTION], value)))
elif (key == engine_api.RES_NAME):
yield ('logical_resource_id', value)
yield (key, value)
else:
yield (key, value)

View File

@ -44,6 +44,10 @@ def format_resource(req, res, keys=[]):
# and RES_STATUS, so the API format doesn't expose the
# internal split of state into action/status
yield (key, '_'.join((res[engine_api.RES_ACTION], value)))
elif (key == engine_api.RES_NAME):
yield ('logical_resource_id', value)
yield (key, value)
else:
yield (key, value)

View File

@ -1344,6 +1344,7 @@ class ResourceControllerTest(ControllerTest, HeatTestCase):
{'href': self._url(stack_identity),
'rel': 'stack'}],
u'resource_name': res_name,
u'logical_resource_id': res_name,
u'resource_status_reason': None,
u'updated_time': u'2012-07-23T13:06:00Z',
u'resource_status': u'CREATE_COMPLETE',
@ -1427,6 +1428,7 @@ class ResourceControllerTest(ControllerTest, HeatTestCase):
],
u'description': u'',
u'resource_name': res_name,
u'logical_resource_id': res_name,
u'resource_status_reason': None,
u'updated_time': u'2012-07-23T13:06:00Z',
u'resource_status': u'CREATE_COMPLETE',
@ -1687,6 +1689,7 @@ class EventControllerTest(ControllerTest, HeatTestCase):
u'event_time': u'2012-07-23T13:05:39Z',
u'stack_identity': dict(stack_identity),
u'resource_name': 'SomeOtherResource',
u'logical_resource_id': 'SomeOtherResource',
u'resource_status_reason': u'state changed',
u'event_identity': dict(ev_identity),
u'resource_action': u'CREATE',
@ -1720,6 +1723,7 @@ class EventControllerTest(ControllerTest, HeatTestCase):
{'href': self._url(stack_identity), 'rel': 'stack'},
],
u'resource_name': res_name,
u'logical_resource_id': res_name,
u'resource_status_reason': u'state changed',
u'event_time': u'2012-07-23T13:05:39Z',
u'resource_status': u'CREATE_IN_PROGRESS',
@ -1781,6 +1785,7 @@ class EventControllerTest(ControllerTest, HeatTestCase):
{'href': self._url(stack_identity), 'rel': 'stack'},
],
u'resource_name': res_name,
u'logical_resource_id': res_name,
u'resource_status_reason': u'state changed',
u'event_time': u'2012-07-23T13:05:39Z',
u'resource_status': u'CREATE_IN_PROGRESS',
@ -1931,6 +1936,7 @@ class EventControllerTest(ControllerTest, HeatTestCase):
{'href': self._url(stack_identity), 'rel': 'stack'},
],
u'resource_name': res_name,
u'logical_resource_id': res_name,
u'resource_status_reason': u'state changed',
u'event_time': u'2012-07-23T13:06:00Z',
u'resource_status': u'CREATE_COMPLETE',