openstack/heat
Code Issues Proposed changes

Merge "Fix Software Deployment DELETE action for CFN_SIGNAL transport"

Browse Source
This commit is contained in:
Jenkins 2015-08-25 10:50:20 +00:00 committed by Gerrit Code Review
commit acc023e5f1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/signal_responder.py
View File

@ -92,8 +92,8 @@ class SignalResponder(stack_user.StackUser):
secret_key = self.data().get('secret_key')
if not access_key or not secret_key:
if self.id is None or self.action == self.DELETE:
# it is either too early or too late to do this
if self.id is None:
# it is too early
return
if self._get_user_id() is None:
self._create_user()

7
heat/tests/test_signal.py
View File

@ -339,9 +339,11 @@ class SignalTest(common.HeatTestCase):
self.stack = self.create_stack()
self.m.StubOutWithMock(self.stack.clients.client_plugin('heat'),
'get_heat_cfn_url')
self.stack.clients.client_plugin('heat').get_heat_cfn_url().AndReturn(
'http://server.test:8000/v1')
self.stack.clients.client_plugin('heat').get_heat_cfn_url().AndReturn(
'http://server.test:8000/v1')
self.m.ReplayAll()
self.stack.create()
@ -353,7 +355,8 @@ class SignalTest(common.HeatTestCase):
rsrc.FnGetAtt('AlarmUrl'))
scheduler.TaskRunner(rsrc.delete)()
self.assertEqual('None', rsrc.FnGetAtt('AlarmUrl'))
self.assertIn('http://server.test:8000/v1/signal',
rsrc.FnGetAtt('AlarmUrl'))
self.m.VerifyAll()