zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-27 18:31:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2049 from chrismeyersfsu/improvement-jobs_total3

Browse Source 
add total job count for instance + instance group
This commit is contained in:
Chris Meyers
2018-06-06 12:56:03 -04:00
committed by GitHub
parent 4f85de5fcf b876c2af62
commit 431ee9bbbf
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/models/ha.py
View File

@@ -106,6 +106,10 @@ class Instance(BaseModel):
def jobs_running(self):
return UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting',)).count()
@property
def jobs_total(self):
return UnifiedJob.objects.filter(execution_node=self.hostname).count()
def is_lost(self, ref_time=None, isolated=False):
if ref_time is None:
ref_time = now()
@@ -178,6 +182,15 @@ class InstanceGroup(BaseModel, RelatedJobsMixin):
def capacity(self):
return sum([inst.capacity for inst in self.instances.all()])
@property
def jobs_running(self):
return UnifiedJob.objects.filter(status__in=('running', 'waiting'),
instance_group=self).count()
@property
def jobs_total(self):
return UnifiedJob.objects.filter(instance_group=self).count()
'''
RelatedJobsMixin
'''