summaryrefslogtreecommitdiffstats
path: root/dashboard
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2019-01-04 09:35:24 -0500
committerParker Berberian <pberberian@iol.unh.edu>2019-01-04 09:35:24 -0500
commit4b16ee60dc157d68f537ecd347c9430f1deb8570 (patch)
tree81decda45cfb22c8b238262ee7a27c2751ee7458 /dashboard
parent676da0a8485b5c380b39857da55eaef9823d9347 (diff)
Fixed Query for free hosts
Change-Id: I05213a3521c5ffa6b311c9e11e9d593dd2098ebe Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Diffstat (limited to 'dashboard')
-rw-r--r--dashboard/src/dashboard/tasks.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/dashboard/src/dashboard/tasks.py b/dashboard/src/dashboard/tasks.py
index 67a06fd..837e7a1 100644
--- a/dashboard/src/dashboard/tasks.py
+++ b/dashboard/src/dashboard/tasks.py
@@ -92,10 +92,14 @@ def free_hosts():
"""
gets all hosts from the database that need to be freed and frees them
"""
- undone_jobs = Job.objects.filter(hostnetworkrelation__status__ne=200, hosthardwarerelation__status__ne=200)
+ undone_statuses = [JobStatus.NEW, JobStatus.CURRENT, JobStatus.ERROR]
+ undone_jobs = Job.objects.filter(
+ hostnetworkrelation__status__in=undone_statuses,
+ hosthardwarerelation__status__in=undone_statuses
+ )
bookings = Booking.objects.exclude(
- job_in=undone_jobs
+ job__in=undone_jobs
).filter(
end__lt=timezone.now(),
job__complete=True,