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

Merge pull request #1337 from AlanCoding/not_negative_no

Browse Source 
never show negative remaining capacity values
This commit is contained in:
Alan Rominger
2018-04-18 16:33:09 -04:00
committed by GitHub
parent 5cd53142a6 9bd64fd490
commit cbe3bc3f2a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -4562,7 +4562,7 @@ 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):
if not obj.capacity or obj.consumed_capacity == obj.capacity: if not obj.capacity or obj.consumed_capacity >= obj.capacity:
return 0.0 return 0.0
else: else:
return float("{0:.2f}".format(((float(obj.capacity) - float(obj.consumed_capacity)) / (float(obj.capacity))) * 100)) return float("{0:.2f}".format(((float(obj.capacity) - float(obj.consumed_capacity)) / (float(obj.capacity))) * 100))
@@ -4619,9 +4619,12 @@ class InstanceGroupSerializer(BaseSerializer):
def get_percent_capacity_remaining(self, obj): def get_percent_capacity_remaining(self, obj):
if not obj.capacity: if not obj.capacity:
return 0.0 return 0.0
consumed = self.get_consumed_capacity(obj)
if consumed >= obj.capacity:
return 0.0
else: else:
return float("{0:.2f}".format( return float("{0:.2f}".format(
((float(obj.capacity) - float(self.get_consumed_capacity(obj))) / (float(obj.capacity))) * 100) ((float(obj.capacity) - float(consumed)) / (float(obj.capacity))) * 100)
) )
def get_jobs_running(self, obj): def get_jobs_running(self, obj):