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

Merge pull request #6712 from AlanCoding/host_sublist

Browse Source 
Optimize inventory hosts sublist
This commit is contained in:
Alan Rominger
2017-06-29 11:35:37 -04:00
committed by GitHub
parent 0f503c90ea fc59a97e44
commit 724a33c945
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/generics.py
View File

@@ -368,12 +368,16 @@ class ListCreateAPIView(ListAPIView, generics.ListCreateAPIView):
class ParentMixin(object): class ParentMixin(object):
parent_object = None
def get_parent_object(self): def get_parent_object(self):
if self.parent_object is not None:
return self.parent_object
parent_filter = { parent_filter = {
self.lookup_field: self.kwargs.get(self.lookup_field, None), self.lookup_field: self.kwargs.get(self.lookup_field, None),
} }
return get_object_or_404(self.parent_model, **parent_filter) self.parent_object = get_object_or_404(self.parent_model, **parent_filter)
return self.parent_object
def check_parent_access(self, parent=None): def check_parent_access(self, parent=None):
parent = parent or self.get_parent_object() parent = parent or self.get_parent_object()

5
awx/api/views.py
View File

@@ -1966,6 +1966,7 @@ class InventoryHostsList(SubListCreateAttachDetachAPIView):
parent_model = Inventory parent_model = Inventory
relationship = 'hosts' relationship = 'hosts'
parent_key = 'inventory' parent_key = 'inventory'
capabilities_prefetch = ['inventory.admin']
class HostGroupsList(ControlledByScmMixin, SubListCreateAttachDetachAPIView): class HostGroupsList(ControlledByScmMixin, SubListCreateAttachDetachAPIView):
@@ -2224,6 +2225,7 @@ class GroupHostsList(ControlledByScmMixin, SubListCreateAttachDetachAPIView):
serializer_class = HostSerializer serializer_class = HostSerializer
parent_model = Group parent_model = Group
relationship = 'hosts' relationship = 'hosts'
capabilities_prefetch = ['inventory.admin']
def update_raw_data(self, data): def update_raw_data(self, data):
data.pop('inventory', None) data.pop('inventory', None)
@@ -2250,6 +2252,7 @@ class GroupAllHostsList(SubListAPIView):
serializer_class = HostSerializer serializer_class = HostSerializer
parent_model = Group parent_model = Group
relationship = 'hosts' relationship = 'hosts'
capabilities_prefetch = ['inventory.admin']
def get_queryset(self): def get_queryset(self):
parent = self.get_parent_object() parent = self.get_parent_object()
@@ -2606,6 +2609,7 @@ class InventorySourceHostsList(SubListAPIView):
parent_model = InventorySource parent_model = InventorySource
relationship = 'hosts' relationship = 'hosts'
new_in_148 = True new_in_148 = True
capabilities_prefetch = ['inventory.admin']
class InventorySourceGroupsList(SubListAPIView): class InventorySourceGroupsList(SubListAPIView):
@@ -3934,6 +3938,7 @@ class JobEventHostsList(SubListAPIView):
parent_model = JobEvent parent_model = JobEvent
relationship = 'hosts' relationship = 'hosts'
view_name = _('Job Event Hosts List') view_name = _('Job Event Hosts List')
capabilities_prefetch = ['inventory.admin']
class BaseJobEventsList(SubListAPIView): class BaseJobEventsList(SubListAPIView):