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

[Senthil Kumaran S]

The job definition sent to lava-dispatcher via lava-scheduler will have target device information in it.

[Neil Williams (codehelp)]

Looks good, thanks.

review: Approve

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

251. By Neil Williams on 2013-06-27

Senthil Kumaran 2013-06-27 Inject actual target device in job definition.
modified:
  lava_scheduler_app/models.py
  lava_scheduler_daemon/dbjobsource.py
  lava_scheduler_daemon/utils.py

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-06-25 12:35:39 +0000
+++ lava_scheduler_app/models.py	2013-06-27 07:34:27 +0000
@@ -1,6 +1,5 @@
 import logging
 import os
-import json
 import uuid
 import simplejson
 import urlparse
@@ -488,30 +487,26 @@
 
         if 'device_group' in job_data:
             target_group = str(uuid.uuid4())
-            node_json, group_json = utils.split_multi_job(job_data,
-                                                          target_group)
+            node_json = utils.split_multi_job(job_data, target_group)
             job_list = []
             try:
                 parent_id = (TestJob.objects.latest('id')).id + 1
             except:
                 parent_id = 1
             child_id = 0
-            parent_job = str(parent_id) + '.' + str(child_id)
 
             for role in node_json:
                 role_count = len(node_json[role])
                 for c in range(0, role_count):
                     device_type = DeviceType.objects.get(
                         name=node_json[role][c]["device_type"])
-                    sub_id = str(parent_id) + '.' + str(child_id)
-                    logger = logging.getLogger("SUBMITLOGGER")
-                    logger.info(json.dumps(node_json[role][c]))
+                    sub_id = '.'.join([str(parent_id), str(child_id)])
 
                     job = TestJob(
                         sub_id=sub_id, submitter=submitter,
                         requested_device=target, description=job_name,
                         requested_device_type=device_type,
-                        definition=json.dumps(node_json[role][c]),
+                        definition=simplejson.dumps(node_json[role][c]),
                         health_check=health_check, user=user, group=group,
                         is_public=is_public, priority=priority,
                         target_group=target_group)

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2013-06-20 11:41:39 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2013-06-27 07:34:27 +0000
@@ -130,6 +130,10 @@
             return None
         else:
             job.actual_device = device
+            job.log_file.save(
+                'job-%s.log' % job.id, ContentFile(''), save=False)
+            job.submit_token = AuthToken.objects.create(user=job.submitter)
+            job.definition = simplejson.dumps(self._get_json_data(job))
             job.save()
             transaction.commit()
         return job

=== modified file 'lava_scheduler_daemon/utils.py'
--- lava_scheduler_daemon/utils.py	2013-06-25 06:11:41 +0000
+++ lava_scheduler_daemon/utils.py	2013-06-27 07:34:27 +0000
@@ -17,28 +17,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
 import copy
-from socket import gethostname
-
-
-def split_multi_job(multi_job_data, target_group):
-    group_json = {}
+
+
+def split_multi_job(json_jobdata, target_group):
     node_json = {}
     all_nodes = {}
     node_actions = {}
-    hostname = gethostname()
     port = 3079
-    json_jobdata = multi_job_data
     if "device_group" in json_jobdata:
-        # multinode start, group stage 1
-        group_json["timeout"] = json_jobdata["timeout"]
-        group_json["group_dispatcher"] = True
-        # group stage 2 - configurable values
-        # all the groupd_dispatcher really needs is the port number to use
-        group_json["logging_level"] = "DEBUG"
-        group_json["port"] = port
-        group_json["hostname"] = hostname
         # multinode node stage 1
         for actions in json_jobdata["actions"]:
             if "parameters" not in actions \
@@ -78,9 +65,8 @@
                 # multinode node stage 2
                 node_json[role][c]["logging_level"] = "DEBUG"
                 node_json[role][c]["port"] = port
-                node_json[role][c]["hostname"] = hostname
                 node_json[role][c]["device_type"] = clients["device_type"]
 
-        return (node_json, group_json)
+        return node_json
 
     return 0