openstack
/
heat
Code Issues Proposed changes

Merge "Add deployment ID to deploy signal events"

This commit is contained in:
Jenkins 2016-05-15 11:55:03 +00:00 committed by Gerrit Code Review
parent ad52b42736 530544b3df
commit e7ae7c3531
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/service_software_config.py
View File

@ -275,9 +275,10 @@ class SoftwareConfigService(service.Service):
status_reasons[output_status_code] = _(
'Deployment exited with non-zero status code: %s'
) % details.get(output_status_code)
event_reason = 'deployment failed (%s)' % status_code
event_reason = 'deployment %s failed (%s)' % (deployment_id,
status_code)
else:
event_reason = 'deployment succeeded'
event_reason = 'deployment %s succeeded' % deployment_id
for output in sd.config.config['outputs'] or []:
out_key = output['name']
@ -286,7 +287,7 @@ class SoftwareConfigService(service.Service):
if output.get('error_output', False):
status = rpc_api.SOFTWARE_DEPLOYMENT_FAILED
status_reasons[out_key] = details[out_key]
event_reason = 'deployment failed'
event_reason = 'deployment %s failed' % deployment_id
for out_key in rpc_api.SOFTWARE_DEPLOYMENT_OUTPUTS:
ov[out_key] = details.get(out_key)

8
heat/tests/engine/service/test_software_config.py
View File

@ -350,7 +350,7 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
deployment_id = deployment['id']
res = self.engine.signal_software_deployment(
self.ctx, deployment_id, {}, None)
self.assertEqual('deployment succeeded', res)
self.assertEqual('deployment %s succeeded' % deployment_id, res)
sd = software_deployment_object.SoftwareDeployment.get_by_id(
self.ctx, deployment_id)
@ -373,7 +373,7 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
deployment_id,
{'foo': 'bar', 'deploy_status_code': 0},
None)
self.assertEqual('deployment succeeded', result)
self.assertEqual('deployment %s succeeded' % deployment_id, result)
sd = software_deployment_object.SoftwareDeployment.get_by_id(
self.ctx, deployment_id)
self.assertEqual('COMPLETE', sd.status)
@ -400,7 +400,7 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
'deploy_stderr': 'Its gone Pete Tong'
},
None)
self.assertEqual('deployment failed (-1)', result)
self.assertEqual('deployment %s failed (-1)' % deployment_id, result)
sd = software_deployment_object.SoftwareDeployment.get_by_id(
self.ctx, deployment_id)
self.assertEqual('FAILED', sd.status)
@ -431,7 +431,7 @@ class SoftwareConfigServiceTest(common.HeatTestCase):
'deploy_stderr': 'Its gone Pete Tong'
},
None)
self.assertEqual('deployment failed', result)
self.assertEqual('deployment %s failed' % deployment_id, result)
sd = software_deployment_object.SoftwareDeployment.get_by_id(
self.ctx, deployment_id)