From 4b16ee60dc157d68f537ecd347c9430f1deb8570 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Fri, 4 Jan 2019 09:35:24 -0500 Subject: Fixed Query for free hosts Change-Id: I05213a3521c5ffa6b311c9e11e9d593dd2098ebe Signed-off-by: Parker Berberian --- dashboard/src/dashboard/tasks.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'dashboard/src') 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, -- cgit 1.2.3-korg