Merge lp:~stylesen/lava-scheduler/fix-bug-1224261 into lp:lava-scheduler

[Senthil Kumaran S]

Fix bug #1224261 - submitting a multinode job for a device_type with no boards fails.

[Neil Williams (codehelp)]

Tested on playground, approved. Thanks.

review: Approve

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-09-04 14:46:59 +0000
+++ lava_scheduler_app/models.py	2013-09-12 06:35:06 +0000
@@ -81,7 +81,7 @@
                 continue
             else:
                 raise DevicesUnavailableException(
-                    "Requested %d %s device(s) - only %d available." % (count, board, all_devices[board]))
+                    "Requested %d %s device(s) - only %d available." % (count, board, all_devices.get(board,0)))
     return True
 
 

=== modified file 'lava_scheduler_app/views.py'
--- lava_scheduler_app/views.py	2013-09-02 15:14:15 +0000
+++ lava_scheduler_app/views.py	2013-09-12 06:35:06 +0000
@@ -53,6 +53,7 @@
     TestJob,
     JSONDataError,
     validate_job_json,
+    DevicesUnavailableException,
 )
 
 
@@ -606,7 +607,8 @@
                     "lava_scheduler_app/job_submit.html",
                     response_data, RequestContext(request))
 
-            except (JSONDataError, ValueError) as e:
+            except (JSONDataError, ValueError, DevicesUnavailableException) \
+                    as e:
                 response_data["error"] = str(e)
                 response_data["json_input"] = request.POST.get("json-input")
                 return render_to_response(
@@ -842,7 +844,7 @@
                     response_data, RequestContext(request))
             else:
                 return redirect(job)
-        except Exception as e:
+        except (JSONDataError, ValueError, DevicesUnavailableException) as e:
             response_data["error"] = str(e)
             response_data["json_input"] = definition
             return render_to_response(