openstack
/
heat
Code Issues Proposed changes

Merge "Correct stack identity when delete nested"

This commit is contained in:
Jenkins 2015-07-29 04:21:07 +00:00 committed by Gerrit Code Review
parent d79d576ff6 ab234eb658
commit 480e63b8a8
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,10 +437,15 @@ class StackResource(resource.Resource):
'''
Delete the nested stack.
'''
stack_identity = identifier.HeatIdentifier(
self.context.tenant_id,
self.physical_resource_name(),
self.resource_id)
try:
stack = self.nested()
except exception.NotFound:
return
if stack is None:
return
stack_identity = stack.identifier()
try:
self.rpc_client().delete_stack(self.context, stack_identity)

5
heat/tests/test_nested_stack.py
View File

@ -371,11 +371,12 @@ Outputs:
def test_handle_delete(self):
self.res.rpc_client = mock.MagicMock()
self.res.action = self.res.CREATE
self.res.nested = mock.MagicMock()
stack_identity = identifier.HeatIdentifier(
self.ctx.tenant_id,
self.res.physical_resource_name(),
self.res.resource_id)
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, stack_identity)
self.ctx, self.res.nested().identifier())

6
heat/tests/test_provider_template.py
View File

@ -985,9 +985,13 @@ class TemplateResourceCrudTest(common.HeatTestCase):
self.res.uuid = six.text_type(uuid.uuid4())
self.res.resource_id = six.text_type(uuid.uuid4())
self.res.action = self.res.CREATE
self.res.nested = mock.MagicMock()
ident = identifier.HeatIdentifier(self.ctx.tenant_id,
self.res.physical_resource_name(),
self.res.resource_id)
self.res.nested().identifier.return_value = ident
self.res.handle_delete()
rpcc = self.res.rpc_client.return_value
rpcc.delete_stack.assert_called_once_with(self.ctx, ident)
rpcc.delete_stack.assert_called_once_with(
self.ctx,
self.res.nested().identifier())

9
heat/tests/test_stack_resource.py
View File

@ -486,14 +486,19 @@ class StackResourceTest(StackResourceBaseTest):
force_reload=True)
self.m.VerifyAll()
def test_delete_nested_not_found_nested_stack(self):
def test_delete_nested_none_nested_stack(self):
self.parent_resource._nested = None
self.assertIsNone(self.parent_resource.delete_nested())
def test_delete_nested_not_found_nested_stack(self):
self.parent_resource._nested = mock.MagicMock()
rpcc = mock.Mock()
self.parent_resource.rpc_client = rpcc
rpcc.return_value.delete_stack = mock.Mock(
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)
def test_need_update_for_nested_resource(self):
"""