openstack
/
heat
Code Issues Proposed changes

Merge "Don't pass input_data to Resource.delete_convergence()"

This commit is contained in:
Zuul 2018-05-14 05:54:31 +00:00 committed by Gerrit Code Review
parent f12426f777 812055ba44
commit 02c9905960
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/check_resource.py
View File

@ -174,8 +174,7 @@ class CheckResource(object):
return False return False
else: else:
check_resource_cleanup(rsrc, tmpl.id, resource_data, check_resource_cleanup(rsrc, tmpl.id, self.engine_id,
self.engine_id,
stack.time_remaining(), self.msg_queue) stack.time_remaining(), self.msg_queue)
return True return True
@ -420,9 +419,9 @@ def check_resource_update(rsrc, template_id, resource_data, engine_id,
check_message) check_message)
def check_resource_cleanup(rsrc, template_id, resource_data, engine_id, def check_resource_cleanup(rsrc, template_id, engine_id,
timeout, msg_queue): timeout, msg_queue):
"""Delete the Resource if appropriate.""" """Delete the Resource if appropriate."""
check_message = functools.partial(_check_for_message, msg_queue) check_message = functools.partial(_check_for_message, msg_queue)
rsrc.delete_convergence(template_id, resource_data, engine_id, timeout, rsrc.delete_convergence(template_id, engine_id, timeout,
check_message) check_message)

5
heat/engine/resource.py
View File

@ -1915,7 +1915,7 @@ class Resource(status.ResourceStatus):
expected_engine_id=None): expected_engine_id=None):
self._incr_atomic_key(self._atomic_key) self._incr_atomic_key(self._atomic_key)
def delete_convergence(self, template_id, input_data, engine_id, timeout, def delete_convergence(self, template_id, engine_id, timeout,
progress_callback=None): progress_callback=None):
"""Destroys the resource if it doesn't belong to given template. """Destroys the resource if it doesn't belong to given template.
@ -1928,8 +1928,7 @@ class Resource(status.ResourceStatus):
the replacement resource's needed_by and replaces fields. the replacement resource's needed_by and replaces fields.
""" """
self._calling_engine_id = engine_id self._calling_engine_id = engine_id
self.needed_by = list(set(v for v in input_data.values() self.needed_by = []
if v is not None))
if self.current_template_id != template_id: if self.current_template_id != template_id:
# just delete the resources in INIT state # just delete the resources in INIT state

6
heat/tests/engine/test_check_resource.py
View File

@ -585,7 +585,7 @@ class CheckWorkflowCleanupTest(common.HeatTestCase):
self.assertFalse(mock_cru.called) self.assertFalse(mock_cru.called)
mock_crc.assert_called_once_with( mock_crc.assert_called_once_with(
self.resource, self.resource.stack.t.id, self.resource, self.resource.stack.t.id,
{}, self.worker.engine_id, self.worker.engine_id,
tr(), mock.ANY) tr(), mock.ANY)
@mock.patch.object(stack.Stack, 'time_remaining') @mock.patch.object(stack.Stack, 'time_remaining')
@ -598,7 +598,7 @@ class CheckWorkflowCleanupTest(common.HeatTestCase):
self.is_update, None) self.is_update, None)
mock_crc.assert_called_once_with(self.resource, mock_crc.assert_called_once_with(self.resource,
self.resource.stack.t.id, self.resource.stack.t.id,
{}, self.worker.engine_id, self.worker.engine_id,
tr(), mock.ANY) tr(), mock.ANY)
self.assertFalse(mock_cru.called) self.assertFalse(mock_cru.called)
self.assertFalse(mock_pcr.called) self.assertFalse(mock_pcr.called)
@ -730,7 +730,7 @@ class MiscMethodsTest(common.HeatTestCase):
def test_check_resource_cleanup_delete(self, mock_delete): def test_check_resource_cleanup_delete(self, mock_delete):
self.resource.current_template_id = 'new-template-id' self.resource.current_template_id = 'new-template-id'
check_resource.check_resource_cleanup( check_resource.check_resource_cleanup(
self.resource, self.resource.stack.t.id, {}, 'engine-id', self.resource, self.resource.stack.t.id, 'engine-id',
self.stack.timeout_secs(), None) self.stack.timeout_secs(), None)
self.assertTrue(mock_delete.called) self.assertTrue(mock_delete.called)

15
heat/tests/test_resource.py
View File

@ -2429,7 +2429,7 @@ class ResourceTest(common.HeatTestCase):
self._assert_resource_lock(res.id, None, None) self._assert_resource_lock(res.id, None, None)
pcb = mock.Mock() pcb = mock.Mock()
with mock.patch.object(resource.Resource, 'delete') as mock_delete: with mock.patch.object(resource.Resource, 'delete') as mock_delete:
tr = scheduler.TaskRunner(res.delete_convergence, 2, {}, tr = scheduler.TaskRunner(res.delete_convergence, 2,
'engine-007', 20, pcb) 'engine-007', 20, pcb)
tr() tr()
self.assertTrue(mock_delete.called) self.assertTrue(mock_delete.called)
@ -2442,7 +2442,7 @@ class ResourceTest(common.HeatTestCase):
res.current_template_id = 'same-template' res.current_template_id = 'same-template'
res.store() res.store()
res.delete = mock.Mock() res.delete = mock.Mock()
tr = scheduler.TaskRunner(res.delete_convergence, 'same-template', {}, tr = scheduler.TaskRunner(res.delete_convergence, 'same-template',
'engine-007', self.dummy_timeout, 'engine-007', self.dummy_timeout,
self.dummy_event) self.dummy_event)
tr() tr()
@ -2459,7 +2459,7 @@ class ResourceTest(common.HeatTestCase):
res.handle_delete = mock.Mock(side_effect=ValueError('test')) res.handle_delete = mock.Mock(side_effect=ValueError('test'))
self._assert_resource_lock(res.id, None, None) self._assert_resource_lock(res.id, None, None)
res.stack.convergence = True res.stack.convergence = True
tr = scheduler.TaskRunner(res.delete_convergence, 2, {}, 'engine-007', tr = scheduler.TaskRunner(res.delete_convergence, 2, 'engine-007',
self.dummy_timeout, self.dummy_event) self.dummy_timeout, self.dummy_event)
self.assertRaises(exception.ResourceFailure, tr) self.assertRaises(exception.ResourceFailure, tr)
self.assertTrue(res.handle_delete.called) self.assertTrue(res.handle_delete.called)
@ -2497,12 +2497,11 @@ class ResourceTest(common.HeatTestCase):
res.action = res.CREATE res.action = res.CREATE
res.store() res.store()
res.destroy = mock.Mock() res.destroy = mock.Mock()
input_data = {(1, False): 4, (2, False): 5} # needed_by resource ids
self._assert_resource_lock(res.id, None, None) self._assert_resource_lock(res.id, None, None)
scheduler.TaskRunner(res.delete_convergence, 1, input_data, scheduler.TaskRunner(res.delete_convergence, 1,
'engine-007', self.dummy_timeout, 'engine-007', self.dummy_timeout,
self.dummy_event)() self.dummy_event)()
self.assertItemsEqual([4, 5], res.needed_by) self.assertItemsEqual([], res.needed_by)
@mock.patch.object(resource_objects.Resource, 'get_obj') @mock.patch.object(resource_objects.Resource, 'get_obj')
def test_update_replacement_data(self, mock_get_obj): def test_update_replacement_data(self, mock_get_obj):
@ -2648,7 +2647,7 @@ class ResourceTest(common.HeatTestCase):
res.store() res.store()
with mock.patch.object(resource_objects.Resource, with mock.patch.object(resource_objects.Resource,
'delete') as resource_del: 'delete') as resource_del:
tr = scheduler.TaskRunner(res.delete_convergence, 1, {}, tr = scheduler.TaskRunner(res.delete_convergence, 1,
'engine-007', 1, self.dummy_event) 'engine-007', 1, self.dummy_event)
tr() tr()
resource_del.assert_called_once_with(res.context, res.id) resource_del.assert_called_once_with(res.context, res.id)
@ -2659,7 +2658,7 @@ class ResourceTest(common.HeatTestCase):
res.action = res.CREATE res.action = res.CREATE
res.store() res.store()
timeout = -1 # to emulate timeout timeout = -1 # to emulate timeout
tr = scheduler.TaskRunner(res.delete_convergence, 1, {}, 'engine-007', tr = scheduler.TaskRunner(res.delete_convergence, 1, 'engine-007',
timeout, self.dummy_event) timeout, self.dummy_event)
self.assertRaises(scheduler.Timeout, tr) self.assertRaises(scheduler.Timeout, tr)