openstack/deb-heat
Code Issues Proposed changes

Merge "convergence: populate stack.resources in Resource.load"

Browse Source
This commit is contained in:
Jenkins 2015-08-28 01:45:15 +00:00 committed by Gerrit Code Review
commit f8f4307f66
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/engine/resource.py
View File

@ -295,6 +295,7 @@ class Resource(object):
if swap_template:
prev_tmpl = stk.t
stk.t = tmpl
stk.resources
yield stk
if swap_template:
stk.t = prev_tmpl

25
heat/tests/test_resource.py
View File

@ -124,6 +124,31 @@ class ResourceTest(common.HeatTestCase):
self.assertEqual(self.old_stack.t, stack.t)
self.assertNotEqual(self.new_stack.t, stack.t)
def test_resource_load_with_no_resources(self):
self.stack = parser.Stack(
utils.dummy_context(), 'test_old_stack',
template.Template({
'HeatTemplateFormatVersion': '2012-12-12',
'Resources': {
'test_res': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'abc'}}}}))
self.stack.store()
snippet = rsrc_defn.ResourceDefinition('aresource',
'GenericResourceType')
# Store Resource
res = resource.Resource('aresource', snippet, self.stack)
res.current_template_id = self.stack.t.id
res.state_set('CREATE', 'IN_PROGRESS')
self.stack.add_resource(res)
origin_resources = self.stack._resources
self.stack._resources = None
loaded_res, stack = resource.Resource.load(self.stack.context,
res.id, False, {})
self.assertEqual(origin_resources, stack._resources)
self.assertEqual(loaded_res.id, res.id)
self.assertEqual(self.stack.t, stack.t)
def test_resource_invalid_name(self):
snippet = rsrc_defn.ResourceDefinition('wrong/name',
'GenericResourceType')