External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Use through table reference to slightly improve host-group association removal

Browse Source
This commit is contained in:
Matthew Jones
2014-05-23 15:56:09 -04:00
parent 8cbf60e3b7
commit 7160bff363
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/models/inventory.py
View File

@@ -534,13 +534,8 @@ class Group(CommonModelNameNotUnique):
from awx.main.tasks import update_inventory_computed_fields, bulk_inventory_element_delete from awx.main.tasks import update_inventory_computed_fields, bulk_inventory_element_delete
from awx.main.utils import ignore_inventory_computed_fields from awx.main.utils import ignore_inventory_computed_fields
from awx.main.signals import disable_activity_stream from awx.main.signals import disable_activity_stream
# group_data = {'parent': self.id, 'inventory': self.inventory.id,
# 'children': [{'id': c.id} for c in self.children.all()],
# 'hosts': [{'id': h.id} for h in self.hosts.all()]}
#self.mark_inactive(clear_children=False)
def remove_host_from_group(host, group): def remove_host_from_group(host, group):
#host.groups.remove(group) #host.inventory_sources.through.objects.filter(inventorysource__group=group).delete()
host.inventory_sources.through.objects.filter(inventorysource__group=group).delete()
return host.groups.count() < 2 return host.groups.count() < 2
def mark_actual(): def mark_actual():
initial_hosts = self.hosts.all().prefetch_related('groups', 'inventory_sources') initial_hosts = self.hosts.all().prefetch_related('groups', 'inventory_sources')
@@ -553,9 +548,9 @@ class Group(CommonModelNameNotUnique):
marked_hosts.append(host) marked_hosts.append(host)
self.hosts.through.objects.filter(group=self).delete() self.hosts.through.objects.filter(group=self).delete()
self.children.through.objects.filter(to_group=self).delete() self.children.through.objects.filter(to_group=self).delete()
self.inventory_sources.through.objects.filter(group=self).delete()
for subgroup in linked_children: for subgroup in linked_children:
parent, group = subgroup parent, group = subgroup
#group.parents.remove(parent)
if group.parents.count() > 1: if group.parents.count() > 1:
continue continue
all_group_hosts = group.hosts.all() all_group_hosts = group.hosts.all()
@@ -568,6 +563,7 @@ class Group(CommonModelNameNotUnique):
linked_children.append((group, childgroup)) linked_children.append((group, childgroup))
marked_groups.append(group) marked_groups.append(group)
group.children.through.objects.filter(to_group=group).delete() group.children.through.objects.filter(to_group=group).delete()
group.inventory_sources.through.objects.filter(group=group).delete()
all_groups = [g.id for g in marked_groups] all_groups = [g.id for g in marked_groups]
all_hosts = [h.id for h in marked_hosts] all_hosts = [h.id for h in marked_hosts]
Group.objects.filter(id__in=all_groups).update(active=False) Group.objects.filter(id__in=all_groups).update(active=False)