External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #480 from AlanCoding/committed_cap

Browse Source 
[3.2.2] add IG committed capacity to serializer
This commit is contained in:
Alan Rominger
2017-10-04 09:22:56 -04:00
committed by Matthew Jones
parent 3df8e2beb1 c45fbcf2ee
commit 4f4af058b3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/api/serializers.py
View File

@@ -3663,6 +3663,7 @@ class InstanceSerializer(BaseSerializer):
class InstanceGroupSerializer(BaseSerializer): class InstanceGroupSerializer(BaseSerializer):
committed_capacity = serializers.SerializerMethodField()
consumed_capacity = serializers.SerializerMethodField() consumed_capacity = serializers.SerializerMethodField()
percent_capacity_remaining = serializers.SerializerMethodField() percent_capacity_remaining = serializers.SerializerMethodField()
jobs_running = serializers.SerializerMethodField() jobs_running = serializers.SerializerMethodField()
@@ -3670,7 +3671,8 @@ class InstanceGroupSerializer(BaseSerializer):
class Meta: class Meta:
model = InstanceGroup model = InstanceGroup
fields = ("id", "type", "url", "related", "name", "created", "modified", "capacity", "consumed_capacity", fields = ("id", "type", "url", "related", "name", "created", "modified",
"capacity", "committed_capacity", "consumed_capacity",
"percent_capacity_remaining", "jobs_running", "instances", "controller") "percent_capacity_remaining", "jobs_running", "instances", "controller")
def get_related(self, obj): def get_related(self, obj):
@@ -3699,7 +3701,10 @@ class InstanceGroupSerializer(BaseSerializer):
return self.context['capacity_map'] return self.context['capacity_map']
def get_consumed_capacity(self, obj): def get_consumed_capacity(self, obj):
return self.get_capacity_dict()[obj.name]['consumed_capacity'] return self.get_capacity_dict()[obj.name]['running_capacity']
def get_committed_capacity(self, obj):
return self.get_capacity_dict()[obj.name]['committed_capacity']
def get_percent_capacity_remaining(self, obj): def get_percent_capacity_remaining(self, obj):
if not obj.capacity: if not obj.capacity: