From 2090e46ac2d06e5b188ffcec5af8130c6c5561e6 Mon Sep 17 00:00:00 2001 From: beeankha Date: Fri, 3 Sep 2021 10:20:54 -0400 Subject: [PATCH 1/2] Add node_type to api/v2/ping/ endpoint --- awx/api/views/root.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/awx/api/views/root.py b/awx/api/views/root.py index 8e1419551d..b2a3d0b8e9 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -151,14 +151,22 @@ class ApiV2PingView(APIView): response['instances'] = [] for instance in Instance.objects.all(): response['instances'].append( - dict(node=instance.hostname, uuid=instance.uuid, heartbeat=instance.modified, capacity=instance.capacity, version=instance.version) + dict( + node=instance.hostname, + node_type=instance.node_type, + uuid=instance.uuid, + heartbeat=instance.modified, + capacity=instance.capacity, + version=instance.version, + ) ) - sorted(response['instances'], key=operator.itemgetter('node')) + response['instances'] = sorted(response['instances'], key=operator.itemgetter('node')) response['instance_groups'] = [] for instance_group in InstanceGroup.objects.prefetch_related('instances'): response['instance_groups'].append( dict(name=instance_group.name, capacity=instance_group.capacity, instances=[x.hostname for x in instance_group.instances.all()]) ) + response['instance_groups'] = sorted(response['instance_groups'], key=operator.itemgetter('name')) return Response(response) From 41a64737824cb40d4c967745383aa064a714ab8d Mon Sep 17 00:00:00 2001 From: beeankha Date: Fri, 3 Sep 2021 13:52:12 -0400 Subject: [PATCH 2/2] Sort instance groups by name regardless of upper/lower case --- awx/api/views/root.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/api/views/root.py b/awx/api/views/root.py index b2a3d0b8e9..110403ed5e 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -166,7 +166,7 @@ class ApiV2PingView(APIView): response['instance_groups'].append( dict(name=instance_group.name, capacity=instance_group.capacity, instances=[x.hostname for x in instance_group.instances.all()]) ) - response['instance_groups'] = sorted(response['instance_groups'], key=operator.itemgetter('name')) + response['instance_groups'] = sorted(response['instance_groups'], key=lambda x: x['name'].lower()) return Response(response)