openstack
/
heat
Code Issues Proposed changes

Allow access to attributes of resumed resources 

RESUME COMPLETE|IN_PROGRESS were not treated as valid states while resolving
attribute, thus causing Fn::GetAtt to fail after a stack is resumed.

Fixes bug #1227025

Change-Id: I37b900c61b7d3017afe75fa726597f458be95d93
This commit is contained in:
Liang Chen 2013-09-21 21:42:13 +08:00
parent 6370a8790e
commit 62b4d55507
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/hot.py
View File

@ -224,6 +224,8 @@ class HOTemplate(template.Template):
if r.state in (
(r.CREATE, r.IN_PROGRESS),
(r.CREATE, r.COMPLETE),
(r.RESUME, r.IN_PROGRESS),
(r.RESUME, r.COMPLETE),
(r.UPDATE, r.IN_PROGRESS),
(r.UPDATE, r.COMPLETE)):
return r.FnGetAtt(att)

2
heat/engine/template.py
View File

@ -164,6 +164,8 @@ class Template(collections.Mapping):
if r.state in (
(r.CREATE, r.IN_PROGRESS),
(r.CREATE, r.COMPLETE),
(r.RESUME, r.IN_PROGRESS),
(r.RESUME, r.COMPLETE),
(r.UPDATE, r.IN_PROGRESS),
(r.UPDATE, r.COMPLETE)):
return r.FnGetAtt(att)

20
heat/tests/test_hot.py
View File

@ -367,11 +367,21 @@ class StackTest(test_parser.StackTest):
(parser.Stack.CREATE, parser.Stack.COMPLETE))
snippet = {'Value': {'get_attr': ['resource1', 'foo']}}
resolved = hot.HOTemplate.resolve_attributes(snippet, self.stack)
# GenericResourceType has an attribute 'foo' which yields the resource
# name.
self.assertEqual(resolved, {'Value': 'resource1'})
# test invalid reference
rsrc = self.stack['resource1']
for action, status in (
(rsrc.CREATE, rsrc.IN_PROGRESS),
(rsrc.CREATE, rsrc.COMPLETE),
(rsrc.RESUME, rsrc.IN_PROGRESS),
(rsrc.RESUME, rsrc.COMPLETE),
(rsrc.UPDATE, rsrc.IN_PROGRESS),
(rsrc.UPDATE, rsrc.COMPLETE)):
rsrc.state_set(action, status)
resolved = hot.HOTemplate.resolve_attributes(snippet, self.stack)
# GenericResourceType has an attribute 'foo' which yields the
# resource name.
self.assertEqual(resolved, {'Value': 'resource1'})
# test invalid reference
self.assertRaises(exception.InvalidTemplateAttribute,
hot.HOTemplate.resolve_attributes,
{'Value': {'get_attr': ['resource1', 'NotThere']}},

2
heat/tests/test_parser.py
View File

@ -1684,6 +1684,8 @@ class StackTest(HeatTestCase):
for action, status in (
(rsrc.CREATE, rsrc.IN_PROGRESS),
(rsrc.CREATE, rsrc.COMPLETE),
(rsrc.RESUME, rsrc.IN_PROGRESS),
(rsrc.RESUME, rsrc.COMPLETE),
(rsrc.UPDATE, rsrc.IN_PROGRESS),
(rsrc.UPDATE, rsrc.COMPLETE)):
rsrc.state_set(action, status)