Merge lp:~codehelp/lava-scheduler/1223264 into lp:lava-scheduler

[Neil Williams]

Fix the pending_devices XML query to check for null device_types in the results of the submitted jobs query.

[Matthew Hart (matthew-hart)]

Nice and simple, I like it.

It's a shame we get None's from the filter but we need to deal with it so looks good, approve.

review: Approve

=== modified file 'lava_scheduler_app/api.py'
--- lava_scheduler_app/api.py	2013-09-02 15:14:15 +0000
+++ lava_scheduler_app/api.py	2013-09-13 12:03:39 +0000
@@ -200,10 +200,15 @@
 
         pending_jobs_by_device = {}
 
-        jobs = TestJob.objects.filter(status=TestJob.SUBMITTED)\
+        jobs_res = TestJob.objects.filter(status=TestJob.SUBMITTED)\
             .values_list('requested_device_type_id')\
             .annotate(pending_jobs=(Count('id')))
-        pending_jobs_by_device.update(dict(jobs))
+        jobs = {}
+        jobs_hash = dict(jobs_res)
+        for job in jobs_hash:
+            if job:
+                jobs[job] = jobs_hash[job]
+        pending_jobs_by_device.update(jobs)
 
         # Get rest of the devices and put number of pending jobs as 0.
         device_types = DeviceType.objects.values_list('name', flat=True)