openstack
/
heat
Code Issues Proposed changes

Merge "convergence: Use the correct template when updating the resource"

This commit is contained in:
Jenkins 2015-06-26 11:05:37 +00:00 committed by Gerrit Code Review
parent d7f668ac98 bd3f4cb839
commit 0976466463
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resource.py
View File

@ -795,7 +795,9 @@ class Resource(object):
given resource_data and existing resource's requires.
'''
with self.lock(engine_id):
runner = scheduler.TaskRunner(self.update, self.t)
new_temp = template.Template.load(self.context, template_id)
new_res_def = new_temp.resource_definitions(self.stack)[self.name]
runner = scheduler.TaskRunner(self.update, new_res_def)
runner()
# update the resource db record (stored in unlock)

21
heat/tests/test_resource.py
View File

@ -1436,16 +1436,27 @@ class ResourceTest(common.HeatTestCase):
@mock.patch.object(resource.Resource, 'update')
def test_update_convergence(self, mock_update):
tmpl = rsrc_defn.ResourceDefinition('test_res', 'Foo')
tmpl = rsrc_defn.ResourceDefinition('test_res',
'ResourceWithPropsType')
res = generic_rsrc.GenericResource('test_res', tmpl, self.stack)
res.requires = [2]
res._store()
self._assert_resource_lock(res.id, None, None)
res.update_convergence('template_key', {(1, True): {},
(1, True): {}}, 'engine-007')
mock_update.assert_called_once_with(res.t)
self.assertEqual('template_key', res.current_template_id)
new_temp = template.Template({
'HeatTemplateFormatVersion': '2012-12-12',
'Resources': {
'test_res': {'Type': 'ResourceWithPropsType',
'Properties': {'Foo': 'abc'}}
}}, env=self.env)
new_temp.store()
res.update_convergence(new_temp.id, {(1, True): {},
(1, True): {}}, 'engine-007')
mock_update.assert_called_once_with(
new_temp.resource_definitions(self.stack)[res.name])
self.assertEqual(new_temp.id, res.current_template_id)
self.assertEqual([1, 2], res.requires)
self._assert_resource_lock(res.id, None, 2)