External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 21:19:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

View Fixes for instance groups

Browse Source 
* Return "instance_groups" instead of "rampart_groups" on the ping
  endpoint
* Don't pre-filter IG jobs endpoints for status
This commit is contained in:
Matthew Jones
2017-05-11 13:55:31 -04:00
parent 704da9c7f2
commit 47f4e5358b
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/api/views.py
View File

@@ -240,11 +240,11 @@ class ApiV1PingView(APIView):
response['instances'].append(dict(node=instance.hostname, heartbeat=instance.modified, response['instances'].append(dict(node=instance.hostname, heartbeat=instance.modified,
capacity=instance.capacity, version=instance.version)) capacity=instance.capacity, version=instance.version))
response['instances'].sort() response['instances'].sort()
response['rampart_groups'] = [] response['instance_groups'] = []
for instance_group in InstanceGroup.objects.all(): for instance_group in InstanceGroup.objects.all():
response['rampart_groups'].append(dict(name=instance_group.name, response['instance_groups'].append(dict(name=instance_group.name,
capacity=instance_group.capacity, capacity=instance_group.capacity,
instances=[x.hostname for x in instance_group.instances.all()])) instances=[x.hostname for x in instance_group.instances.all()]))
return Response(response) return Response(response)
@@ -532,7 +532,7 @@ class InstanceUnifiedJobsList(SubListAPIView):
def get_queryset(self): def get_queryset(self):
po = self.get_parent_object() po = self.get_parent_object()
qs = get_user_queryset(self.request.user, UnifiedJob) qs = get_user_queryset(self.request.user, UnifiedJob)
qs = qs.filter(execution_node=po.hostname, status__in=('running', 'waiting', 'pending')) qs = qs.filter(execution_node=po.hostname)
return qs return qs
@@ -568,14 +568,9 @@ class InstanceGroupUnifiedJobsList(SubListAPIView):
model = UnifiedJob model = UnifiedJob
serializer_class = UnifiedJobSerializer serializer_class = UnifiedJobSerializer
parent_model = InstanceGroup parent_model = InstanceGroup
relationship = "instance_group"
new_in_320 = True new_in_320 = True
def get_queryset(self):
po = self.get_parent_object()
qs = get_user_queryset(self.request.user, UnifiedJob)
qs = qs.filter(instance_group=po, status__in=('running', 'waiting', 'pending'))
return qs
class InstanceGroupInstanceList(SubListAPIView): class InstanceGroupInstanceList(SubListAPIView):