openstack/heat
Code Issues Proposed changes

Merge "Add stack tags to stack abandon output"

Browse Source
This commit is contained in:
Jenkins 2015-10-13 08:01:51 +00:00 committed by Gerrit Code Review
commit a8b15085d7
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/stack.py
View File

@ -1668,7 +1668,8 @@ class Stack(collections.Mapping):
'resources': dict((res.name, res.prepare_abandon())
for res in six.itervalues(self.resources)),
'project_id': self.tenant_id,
'stack_user_project_id': self.stack_user_project_id
'stack_user_project_id': self.stack_user_project_id,
'tags': self.tags,
}
def resolve_static_data(self, snippet):

4
heat/tests/test_engine_service.py
View File

@ -830,9 +830,10 @@ class StackServiceTest(common.HeatTestCase):
'resource_id': '9999',
'status': 'COMPLETE',
'type': u'AWS::EC2::Instance'}}
self.stack.tags = ['tag1', 'tag2']
self.m.ReplayAll()
ret = self.eng.abandon_stack(self.ctx, self.stack.identifier())
self.assertEqual(10, len(ret))
self.assertEqual(11, len(ret))
self.assertEqual('CREATE', ret['action'])
self.assertEqual('COMPLETE', ret['status'])
self.assertEqual('service_abandon_stack', ret['name'])
@ -844,6 +845,7 @@ class StackServiceTest(common.HeatTestCase):
self.assertIn('stack_user_project_id', ret)
self.assertIn('environment', ret)
self.assertIn('files', ret)
self.assertEqual(['tag1', 'tag2'], ret['tags'])
self.m.VerifyAll()
def test_stack_describe_nonexistent(self):

4
heat/tests/test_stack.py
View File

@ -376,7 +376,8 @@ class StackTest(common.HeatTestCase):
self.stack = stack.Stack(self.ctx, 'stack_details_test',
template.Template(tpl, env=env),
tenant_id='123',
stack_user_project_id='234')
stack_user_project_id='234',
tags=['tag1', 'tag2'])
self.stack.store()
info = self.stack.prepare_abandon()
self.assertEqual('CREATE', info['action'])
@ -388,6 +389,7 @@ class StackTest(common.HeatTestCase):
self.assertEqual('123', info['project_id'])
self.assertEqual('234', info['stack_user_project_id'])
self.assertEqual(env.params, info['environment']['parameters'])
self.assertEqual(['tag1', 'tag2'], info['tags'])
def test_set_param_id(self):
self.stack = stack.Stack(self.ctx, 'param_arn_test', self.tmpl)