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

Merge pull request #4647 from rebeccahhh/devel

Browse Source 
Added 'rescued' and 'ignored' fields into all_hosts dictionary update

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-09-04 20:48:04 +00:00
committed by GitHub
parent 4edfe7e5fc daba25f107
commit c819a78a4b
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/jobs.py
View File

@@ -666,6 +666,14 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
def processed_hosts(self): def processed_hosts(self):
return self._get_hosts(job_host_summaries__processed__gt=0) return self._get_hosts(job_host_summaries__processed__gt=0)
@property
def ignored_hosts(self):
return self._get_hosts(job_host_summaries__ignored__gt=0)
@property
def rescued_hosts(self):
return self._get_hosts(job_host_summaries__rescued__gt=0)
def notification_data(self, block=5): def notification_data(self, block=5):
data = super(Job, self).notification_data() data = super(Job, self).notification_data()
all_hosts = {} all_hosts = {}
@@ -684,7 +692,9 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
failures=h.failures, failures=h.failures,
ok=h.ok, ok=h.ok,
processed=h.processed, processed=h.processed,
skipped=h.skipped) # TODO: update with rescued, ignored (see https://github.com/ansible/awx/issues/4394) skipped=h.skipped,
rescued=h.rescued,
ignored=h.ignored)
data.update(dict(inventory=self.inventory.name if self.inventory else None, data.update(dict(inventory=self.inventory.name if self.inventory else None,
project=self.project.name if self.project else None, project=self.project.name if self.project else None,
playbook=self.playbook, playbook=self.playbook,

20
awx/main/tests/functional/test_jobs.py
View File

@@ -2,7 +2,7 @@ import pytest
from unittest import mock from unittest import mock
import json import json
from awx.main.models import Job, Instance from awx.main.models import Job, Instance, JobHostSummary
from awx.main.tasks import cluster_node_heartbeat from awx.main.tasks import cluster_node_heartbeat
from django.test.utils import override_settings from django.test.utils import override_settings
@@ -47,6 +47,24 @@ def test_job_notification_data(inventory, machine_credential, project):
assert json.loads(notification_data['extra_vars'])['SSN'] == encrypted_str assert json.loads(notification_data['extra_vars'])['SSN'] == encrypted_str
@pytest.mark.django_db
def test_job_notification_host_data(inventory, machine_credential, project, job_template, host):
job = Job.objects.create(
job_template=job_template, inventory=inventory, name='hi world', project=project
)
JobHostSummary.objects.create(job=job, host=host, changed=1, dark=2, failures=3, ok=4, processed=3, skipped=2, rescued=1, ignored=0)
assert job.notification_data()['hosts'] == {'single-host':
{'failed': True,
'changed': 1,
'dark': 2,
'failures': 3,
'ok': 4,
'processed': 3,
'skipped': 2,
'rescued': 1,
'ignored': 0}}
@pytest.mark.django_db @pytest.mark.django_db
class TestLaunchConfig: class TestLaunchConfig: