Merge lp:lava-scheduler/lmp into lp:lava-scheduler

[Fu Wei]

Add LMP modules init value support

[Antonio Terceiro (terceiro)]

Looks OK to me.

 review approve

review: Approve

=== modified file 'lava_scheduler_app/utils.py'
--- lava_scheduler_app/utils.py	2013-09-12 09:30:32 +0000
+++ lava_scheduler_app/utils.py	2013-09-17 15:23:11 +0000
@@ -46,6 +46,7 @@
     node_json = {}
     all_nodes = {}
     node_actions = {}
+    node_lmp = {}
     
     # Check if we are operating on multinode job data. Else return the job
     # data as it is.
@@ -57,6 +58,7 @@
     # get all the roles and create node action list for each role.
     for group in json_jobdata["device_group"]:
         node_actions[group["role"]] = []
+        node_lmp[group["role"]] = []
 
     # Take each action and assign it to proper roles. If roles are not
     # specified for a specific action, then assign it to all the roles.
@@ -72,6 +74,19 @@
             else:
                 node_actions[role].append(new_action)
 
+    # For LMP init in multinode case
+    all_lmp_modules = json_jobdata["lmp_module"]
+    for role in node_lmp.keys():
+        for lmp in all_lmp_modules:
+            new_lmp = copy.deepcopy(lmp)
+            if 'parameters' in new_lmp \
+                    and 'role' in new_lmp["parameters"]:
+                if new_lmp["parameters"]["role"] == role:
+                    new_lmp["parameters"].pop('role', None)
+                    node_lmp[role].append(new_lmp)
+            else:
+                node_lmp[role].append(new_lmp)
+
     group_count = 0
     for clients in json_jobdata["device_group"]:
         group_count += int(clients["count"])
@@ -91,6 +106,7 @@
             node_json[role][c]["group_size"] = group_count
             node_json[role][c]["target_group"] = target_group
             node_json[role][c]["actions"] = node_actions[role]
+            node_json[role][c]["lmp_module"] = node_lmp[role]
 
             node_json[role][c]["role"] = role
             # multinode node stage 2