External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 03:45:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Set default messages for approval notifications

Browse Source
This commit is contained in:
beeankha
2019-09-06 22:07:13 -04:00
parent 7eb7aad491
commit 57fd6b7280
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
awx/main/models/workflow.py
View File

@@ -577,13 +577,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
for node in self.workflow_job_nodes.all().select_related('job'): for node in self.workflow_job_nodes.all().select_related('job'):
if node.job is None: if node.job is None:
node_job_description = 'no job.' node_job_description = 'no job.'
elif type(node.unified_job_template) is WorkflowApprovalTemplate:
if node.job.status == 'pending':
node_job_description = 'APPROVE THIS!!!'
if node.job.status == 'successful':
node_job_description = 'THIS GOT APPROVED!!!'
if node.job.status == 'failed':
node_job_description = 'DENIED!!!'
else: else:
node_job_description = ('job #{0}, "{1}", which finished with status {2}.' node_job_description = ('job #{0}, "{1}", which finished with status {2}.'
.format(node.job.id, node.job.name, node.job.status)) .format(node.job.id, node.job.name, node.job.status))
@@ -699,7 +692,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
def approve(self, request=None): def approve(self, request=None):
self.status = 'successful' self.status = 'successful'
self.save() self.save()
self.send_approval_notification(self.status) self.send_approval_notification('approved')
self.websocket_emit_status(self.status) self.websocket_emit_status(self.status)
schedule_task_manager() schedule_task_manager()
return reverse('api:workflow_approval_approve', kwargs={'pk': self.pk}, request=request) return reverse('api:workflow_approval_approve', kwargs={'pk': self.pk}, request=request)
@@ -707,7 +700,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
def deny(self, request=None): def deny(self, request=None):
self.status = 'failed' self.status = 'failed'
self.save() self.save()
self.send_approval_notification(self.status) self.send_approval_notification('denied')
self.websocket_emit_status(self.status) self.websocket_emit_status(self.status)
schedule_task_manager() schedule_task_manager()
return reverse('api:workflow_approval_deny', kwargs={'pk': self.pk}, request=request) return reverse('api:workflow_approval_deny', kwargs={'pk': self.pk}, request=request)
@@ -720,7 +713,10 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
def send_approval_notification(self, status): def send_approval_notification(self, status):
from awx.main.tasks import send_notifications # avoid circular import from awx.main.tasks import send_notifications # avoid circular import
for nt in self.workflow_job_template.notification_templates["approvals"]: for nt in self.workflow_job_template.notification_templates["approvals"]:
(notification_subject, notification_body) = self.workflow_job.build_notification_message(nt, status) try:
(notification_subject, notification_body) = self.build_notification_message(nt, status)
except AttributeError:
raise NotImplementedError("build_notification_message() does not exist" % status)
def send_it(local_nt=nt, local_subject=notification_subject, local_body=notification_body): def send_it(local_nt=nt, local_subject=notification_subject, local_body=notification_body):
def _func(): def _func():
@@ -729,6 +725,26 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
return _func return _func
connection.on_commit(send_it()) connection.on_commit(send_it())
def build_notification_message(self, nt, status):
subject = []
subject.append(('{}, Job Number {}').format(self.workflow_approval_template.name,
self.id))
if status == 'running':
subject.append('Please approve or deny this node.')
if status == 'approved':
subject.append('This approval node was approved.')
if status == 'timed_out':
subject.append('This approval node has timed out.')
elif status == 'denied':
subject.append('This approval node was denied.')
body = self.notification_data()
body['body'] = subject
return subject, body
# def get_notification_templates(self):
# return self.workflow_job_template.notification_templates
@property @property
def workflow_job_template(self): def workflow_job_template(self):
try: try:

2
awx/main/scheduler/task_manager.py
View File

@@ -533,7 +533,7 @@ class TaskManager():
logger.warn(timeout_message) logger.warn(timeout_message)
task.timed_out = True task.timed_out = True
task.status = 'failed' task.status = 'failed'
self.send_approval_notification(task.status) task.send_approval_notification('timed_out')
task.websocket_emit_status(task.status) task.websocket_emit_status(task.status)
task.job_explanation = timeout_message task.job_explanation = timeout_message
task.save(update_fields=['status', 'job_explanation', 'timed_out']) task.save(update_fields=['status', 'job_explanation', 'timed_out'])