openstack
/
heat
Code Issues Proposed changes

Merge "Don't use cast() to do StackResource delete" into stable/newton

This commit is contained in:
Jenkins 2016-09-23 05:32:54 +00:00 committed by Gerrit Code Review
parent fb26ec9da5 a96d89b200
commit e4c4c56464
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/stack_resource.py
View File

@ -524,9 +524,10 @@ class StackResource(resource.Resource):
if self.abandon_in_progress:
self.rpc_client().abandon_stack(self.context, stack_identity)
else:
self.rpc_client().delete_stack(self.context, stack_identity)
self.rpc_client().delete_stack(self.context, stack_identity,
cast=False)
except Exception as ex:
self.rpc_client().ignore_error_named(ex, 'NotFound')
self.rpc_client().ignore_error_named(ex, 'EntityNotFound')
def handle_delete(self):
return self.delete_nested()

2
heat/tests/test_nested_stack.py
View File

@ -413,4 +413,4 @@ Outputs:
self.res.nested().identifier.return_value = stack_identity
self.res.handle_delete()
self.res.rpc_client.return_value.delete_stack.assert_called_once_with(
self.ctx, self.res.nested().identifier())
self.ctx, self.res.nested().identifier(), cast=False)

3
heat/tests/test_provider_template.py
View File

@ -1021,4 +1021,5 @@ class TemplateResourceCrudTest(common.HeatTestCase):
rpcc = self.res.rpc_client.return_value
rpcc.delete_stack.assert_called_once_with(
self.ctx,
self.res.nested().identifier())
self.res.nested().identifier(),
cast=False)

2
heat/tests/test_stack_resource.py
View File

@ -514,7 +514,7 @@ class StackResourceTest(StackResourceBaseTest):
side_effect=exception.NotFound())
self.assertIsNone(self.parent_resource.delete_nested())
rpcc.return_value.delete_stack.assert_called_once_with(
self.parent_resource.context, mock.ANY)
self.parent_resource.context, mock.ANY, cast=False)
def test_need_update_for_nested_resource(self):
"""Test the resource with nested stack should need update.