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

Merge pull request #379 from jangsutsr/7514_enhance_job_event_save_query_for_fetching_hosts

Browse Source 
Enhace query string in job event save to consider smart inventory
This commit is contained in:
Aaron Tan
2017-09-01 09:53:14 -04:00
committed by GitHub
parent ddc2af0691 839f3a4d2c
commit 6f96df6bbb
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,7 +1166,6 @@ class JobEvent(CreatedModifiedModel):
def _update_hosts(self, extra_host_pks=None): def _update_hosts(self, extra_host_pks=None):
# Update job event hosts m2m from host_name, propagate to parent events. # Update job event hosts m2m from host_name, propagate to parent events.
from awx.main.models.inventory import Host
extra_host_pks = set(extra_host_pks or []) extra_host_pks = set(extra_host_pks or [])
hostnames = set() hostnames = set()
if self.host_name: if self.host_name:
@@ -1177,7 +1176,7 @@ class JobEvent(CreatedModifiedModel):
hostnames.update(v.keys()) hostnames.update(v.keys())
except AttributeError: # In case event_data or v isn't a dict. except AttributeError: # In case event_data or v isn't a dict.
pass pass
qs = Host.objects.filter(inventory__jobs__id=self.job_id) qs = self.job.inventory.hosts.all()
qs = qs.filter(Q(name__in=hostnames) | Q(pk__in=extra_host_pks)) qs = qs.filter(Q(name__in=hostnames) | Q(pk__in=extra_host_pks))
qs = qs.exclude(job_events__pk=self.id).only('id') qs = qs.exclude(job_events__pk=self.id).only('id')
for host in qs: for host in qs:
@@ -1224,7 +1223,6 @@ class JobEvent(CreatedModifiedModel):
host_summary.save(update_fields=update_fields) host_summary.save(update_fields=update_fields)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
from awx.main.models.inventory import Host
# If update_fields has been specified, add our field names to it, # If update_fields has been specified, add our field names to it,
# if it hasn't been specified, then we're just doing a normal save. # if it hasn't been specified, then we're just doing a normal save.
update_fields = kwargs.get('update_fields', []) update_fields = kwargs.get('update_fields', [])
@@ -1239,7 +1237,7 @@ class JobEvent(CreatedModifiedModel):
update_fields.append(field) update_fields.append(field)
# Update host related field from host_name. # Update host related field from host_name.
if not self.host_id and self.host_name: if not self.host_id and self.host_name:
host_qs = Host.objects.filter(inventory__jobs__id=self.job_id, name=self.host_name) host_qs = self.job.inventory.hosts.filter(name=self.host_name)
host_id = host_qs.only('id').values_list('id', flat=True).first() host_id = host_qs.only('id').values_list('id', flat=True).first()
if host_id != self.host_id: if host_id != self.host_id:
self.host_id = host_id self.host_id = host_id