Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode

[Senthil Kumaran S]

Catch device availability during multinode job submission.

[lp:~stylesen/lava-scheduler/multinode]

255. By Neil Williams on 2013-06-28

Senthil Kumaran 2013-06-27 Detect device availability during job submission for multinode jobs.

=== modified file 'lava_scheduler_app/api.py'
--- lava_scheduler_app/api.py	2013-06-20 11:41:39 +0000
+++ lava_scheduler_app/api.py	2013-06-27 14:57:48 +0000
@@ -2,6 +2,7 @@
 from simplejson import JSONDecodeError
 from django.db.models import Count
 from linaro_django_xmlrpc.models import ExposedAPI
+from lava_scheduler_app import utils
 from lava_scheduler_app.models import (
     Device,
     DeviceType,
@@ -27,6 +28,20 @@
                 "'lava_scheduler_app.add_testjob' permission.  Contact "
                 "the administrators." % self.user.username)
         try:
+            requested_devices = utils.requested_device_count(job_data)
+            if requested_devices:
+                all_devices = {}
+                for d in self.all_device_types():
+                    all_devices[d['name']] = d['idle'] + d['busy']
+
+                for board, count in requested_devices.iteritems():
+                    if all_devices.get(board, None) and \
+                            count <= all_devices[board]:
+                        continue
+                    else:
+                        raise xmlrpclib.Fault(
+                            400, "Required number of device(s) unavailable.")
+
             job = TestJob.from_json_and_user(job_data, self.user)
         except JSONDecodeError as e:
             raise xmlrpclib.Fault(400, "Decoding JSON failed: %s." % e)

=== modified file 'lava_scheduler_app/utils.py'
--- lava_scheduler_app/utils.py	2013-06-27 12:17:42 +0000
+++ lava_scheduler_app/utils.py	2013-06-27 14:57:48 +0000
@@ -18,6 +18,7 @@
 # along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 
 import copy
+import simplejson
 
 
 def split_multi_job(json_jobdata, target_group):
@@ -70,3 +71,29 @@
         return node_json
 
     return 0
+
+
+def requested_device_count(json_data):
+    """Utility function check the requested number of devices for each
+    device_type in a multinode job.
+
+    JSON_DATA is the job definition string.
+
+    Returns requested_device which is a dictionary of the following format:
+
+    {'kvm': 1, 'qemu': 3, 'panda': 1}
+
+    If the job is not a multinode job, then return None.
+    """
+    job_data = simplejson.loads(json_data)
+    if 'device_group' in job_data:
+        requested_devices = {}
+        for device_group in job_data['device_group']:
+            device_type = device_group['device_type']
+            count = device_group['count']
+            requested_devices[device_type] = count
+        return requested_devices
+    else:
+        # TODO: Put logic to check whether we have requested devices attached
+        #       to this lava-server, even if it is a single node job?
+        return None