External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 13:27:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1160 from chrismeyersfsu/fix-instance_running_jobs

Browse Source 
fix api browser endpoint title
This commit is contained in:
Chris Meyers
2018-03-28 16:31:00 -04:00
committed by GitHub
parent c7ecbb7d2a bf6412ea06
commit 8c3b1c06d9
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/serializers.py
View File

@@ -4505,7 +4505,12 @@ class InstanceSerializer(BaseSerializer):
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.IntegerField(
help_text=_('Count of jobs in the running or waiting state that '
'are targeted for this instance'),
read_only=True
)
class Meta: class Meta:
model = Instance model = Instance
@@ -4529,9 +4534,6 @@ class InstanceSerializer(BaseSerializer):
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))
def get_jobs_running(self, obj):
return UnifiedJob.objects.filter(execution_node=obj.hostname, status__in=('running', 'waiting',)).count()
class InstanceGroupSerializer(BaseSerializer): class InstanceGroupSerializer(BaseSerializer):

2
awx/api/views.py
View File

@@ -631,7 +631,7 @@ class InstanceDetail(RetrieveUpdateAPIView):
class InstanceUnifiedJobsList(SubListAPIView): class InstanceUnifiedJobsList(SubListAPIView):
view_name = _("Instance Running Jobs") view_name = _("Instance Jobs")
model = UnifiedJob model = UnifiedJob
serializer_class = UnifiedJobSerializer serializer_class = UnifiedJobSerializer
parent_model = Instance parent_model = Instance

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

@@ -85,6 +85,10 @@ class Instance(models.Model):
# NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing
return "awx" return "awx"
@property
def jobs_running(self):
return UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting',)).count()
def is_lost(self, ref_time=None, isolated=False): def is_lost(self, ref_time=None, isolated=False):
if ref_time is None: if ref_time is None:
ref_time = now() ref_time = now()