openstack/deb-heat
Code Issues Proposed changes

Merge "Don't manipulate template during abandon"

Browse Source
This commit is contained in:
Jenkins 2014-04-25 16:47:56 +00:00 committed by Gerrit Code Review
commit 98c5f76791
7 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/parser.py
View File

@ -787,22 +787,18 @@ class Stack(collections.Mapping):
self.clients.nova().availability_zones.list(detailed=False)]
return self._zones
def set_deletion_policy(self, policy):
for res in self.resources.values():
res.set_deletion_policy(policy)
def set_stack_user_project_id(self, project_id):
self.stack_user_project_id = project_id
self.store()
def get_abandon_data(self):
def prepare_abandon(self):
return {
'name': self.name,
'id': self.id,
'action': self.action,
'status': self.status,
'template': self.t.t,
'resources': dict((res.name, res.get_abandon_data())
'resources': dict((res.name, res.prepare_abandon())
for res in self.resources.values())
}

13
heat/engine/resource.py
View File

@ -149,6 +149,8 @@ class Resource(object):
self.attributes_schema,
self._resolve_attribute)
self.abandon_in_progress = False
if stack.id:
resource = db_api.resource_get_by_name_and_stack(self.context,
name, stack.id)
@ -451,10 +453,8 @@ class Resource(object):
self.reparse()
return self._do_action(action, self.properties.validate)
def set_deletion_policy(self, policy):
self.t['DeletionPolicy'] = policy
def get_abandon_data(self):
def prepare_abandon(self):
self.abandon_in_progress = True
return {
'name': self.name,
'resource_id': self.resource_id,
@ -673,7 +673,10 @@ class Resource(object):
try:
self.state_set(action, self.IN_PROGRESS)
deletion_policy = self.t.get('DeletionPolicy', DELETE)
if self.abandon_in_progress:
deletion_policy = RETAIN
else:
deletion_policy = self.t.get('DeletionPolicy', DELETE)
handle_data = None
if deletion_policy == DELETE:
if callable(getattr(self, 'handle_delete', None)):

4
heat/engine/service.py
View File

@ -748,9 +748,7 @@ class EngineService(service.Service):
try:
# Get stack details before deleting it.
stack_info = stack.get_abandon_data()
# Set deletion policy to 'Retain' for all resources in the stack.
stack.set_deletion_policy(resource.RETAIN)
stack_info = stack.prepare_abandon()
except:
with excutils.save_and_reraise_exception():
lock.release(stack.id)

7
heat/engine/stack_resource.py
View File

@ -304,11 +304,8 @@ class StackResource(resource.Resource):
return done
def set_deletion_policy(self, policy):
self.nested().set_deletion_policy(policy)
def get_abandon_data(self):
return self.nested().get_abandon_data()
def prepare_abandon(self):
return self.nested().prepare_abandon()
def get_output(self, op):
'''

17
heat/tests/test_parser.py
View File

@ -1063,7 +1063,7 @@ class StackTest(HeatTestCase):
self.stack = parser.Stack(self.ctx, 'stack_details_test',
parser.Template(tpl))
self.stack.store()
info = self.stack.get_abandon_data()
info = self.stack.prepare_abandon()
self.assertIsNone(info['action'])
self.assertIn('id', info)
self.assertEqual('stack_details_test', info['name'])
@ -1071,21 +1071,6 @@ class StackTest(HeatTestCase):
self.assertIsNone(info['status'])
self.assertEqual(tpl, info['template'])
@utils.stack_delete_after
def test_set_stack_res_deletion_policy(self):
tpl = {'Resources':
{'A': {'Type': 'GenericResourceType'},
'B': {'Type': 'GenericResourceType'}}}
stack = parser.Stack(self.ctx,
'stack_details_test',
parser.Template(tpl))
stack.store()
stack.set_deletion_policy(resource.RETAIN)
self.assertEqual(resource.RETAIN,
stack.resources['A'].t['DeletionPolicy'])
self.assertEqual(resource.RETAIN,
stack.resources['B'].t['DeletionPolicy'])
@utils.stack_delete_after
def test_set_param_id(self):
self.stack = parser.Stack(self.ctx, 'param_arn_test',

14
heat/tests/test_resource.py
View File

@ -148,15 +148,7 @@ class ResourceTest(HeatTestCase):
self.assertEqual((res.CREATE, res.COMPLETE), res.state)
self.assertEqual('wibble', res.status_reason)
def test_set_deletion_policy(self):
tmpl = {'Type': 'Foo'}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack)
res.set_deletion_policy(resource.RETAIN)
self.assertEqual(resource.RETAIN, res.t['DeletionPolicy'])
res.set_deletion_policy(resource.DELETE)
self.assertEqual(resource.DELETE, res.t['DeletionPolicy'])
def test_get_abandon_data(self):
def test_prepare_abandon(self):
tmpl = {'Type': 'Foo'}
res = generic_rsrc.GenericResource('test_resource', tmpl, self.stack)
expected = {
@ -168,7 +160,7 @@ class ResourceTest(HeatTestCase):
'status': 'COMPLETE',
'type': 'Foo'
}
actual = res.get_abandon_data()
actual = res.prepare_abandon()
self.assertEqual(expected, actual)
def test_abandon_with_resource_data(self):
@ -187,7 +179,7 @@ class ResourceTest(HeatTestCase):
'status': 'COMPLETE',
'type': 'Foo'
}
actual = res.get_abandon_data()
actual = res.prepare_abandon()
self.assertEqual(expected, actual)
self.m.VerifyAll()

13
heat/tests/test_stack_resource.py
View File

@ -242,19 +242,10 @@ class StackResourceTest(HeatTestCase):
self.assertEqual(self.stack.id, self.parent_resource.resource_id)
@utils.stack_delete_after
def test_set_deletion_policy(self):
def test_prepare_abandon(self):
self.parent_resource.create_with_template(self.templ,
{"KeyName": "key"})
self.stack = self.parent_resource.nested()
self.parent_resource.set_deletion_policy(resource.RETAIN)
for res in self.stack.resources.values():
self.assertEqual(resource.RETAIN, res.t['DeletionPolicy'])
@utils.stack_delete_after
def test_get_abandon_data(self):
self.parent_resource.create_with_template(self.templ,
{"KeyName": "key"})
ret = self.parent_resource.get_abandon_data()
ret = self.parent_resource.prepare_abandon()
# check abandoned data contains all the necessary information.
# (no need to check stack/resource IDs, because they are
# randomly generated uuids)