Fixed Query for free hosts 97/66197/1
authorParker Berberian <pberberian@iol.unh.edu>
Fri, 4 Jan 2019 14:35:24 +0000 (09:35 -0500)
committerParker Berberian <pberberian@iol.unh.edu>
Fri, 4 Jan 2019 14:35:24 +0000 (09:35 -0500)
Change-Id: I05213a3521c5ffa6b311c9e11e9d593dd2098ebe
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
dashboard/src/dashboard/tasks.py

index 67a06fd..837e7a1 100644 (file)
@@ -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,