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

Merge pull request #6628 from rooftopcellist/cap-fix

Browse Source 
Capacity percentage fix
This commit is contained in:
Christian Adams
2017-06-20 11:47:32 -04:00
committed by GitHub
parent 8ae8e0bf2d fa5b18e4d3
commit e7885edaa1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/serializers.py
View File

@@ -3465,7 +3465,10 @@ class InstanceSerializer(BaseSerializer):
return obj.consumed_capacity return obj.consumed_capacity
def get_percent_capacity_remaining(self, obj): def get_percent_capacity_remaining(self, obj):
return float("{0:.2f}".format((float(obj.consumed_capacity) / float(obj.capacity)) * 100.0)) if not obj.capacity or obj.consumed_capacity == obj.capacity:
return 0.0
else:
return float("{0:.2f}".format(((float(obj.capacity) - float(obj.consumed_capacity)) / (float(obj.capacity))) * 100))
def get_jobs_running(self, obj): def get_jobs_running(self, obj):
return UnifiedJob.objects.filter(execution_node=obj.hostname, status__in=('running', 'waiting',)).count() return UnifiedJob.objects.filter(execution_node=obj.hostname, status__in=('running', 'waiting',)).count()
@@ -3494,7 +3497,10 @@ class InstanceGroupSerializer(BaseSerializer):
return obj.consumed_capacity return obj.consumed_capacity
def get_percent_capacity_remaining(self, obj): def get_percent_capacity_remaining(self, obj):
return float("{0:.2f}".format((float(obj.consumed_capacity) / float(obj.capacity)) * 100.0)) if not obj.capacity or obj.consumed_capacity == obj.capacity:
return 0.0
else:
return float("{0:.2f}".format(((float(obj.capacity) - float(obj.consumed_capacity)) / (float(obj.capacity))) * 100))
def get_jobs_running(self, obj): def get_jobs_running(self, obj):
return UnifiedJob.objects.filter(instance_group=obj, status__in=('running', 'waiting',)).count() return UnifiedJob.objects.filter(instance_group=obj, status__in=('running', 'waiting',)).count()