Merge lp:~fu-wei/lava-scheduler/lmp into lp:lava-scheduler

[Fu Wei]

Fix the bug of LMP init value in Multi-Node 2

[Neil Williams (codehelp)]

Merged into git.

review: Disapprove

Unmerged revisions

265. By Fu Wei on 2013-09-18

Fix the bug of LMP init value in Multi-Node 2

264. By Fu Wei on 2013-09-18

Fix the bug of LMP init value in Multi-Node

=== modified file 'lava_scheduler_app/utils.py'
--- lava_scheduler_app/utils.py	2013-09-17 14:59:18 +0000
+++ lava_scheduler_app/utils.py	2013-09-18 14:47:33 +0000
@@ -75,17 +75,18 @@
                 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)
+    if "lmp_module" in json_jobdata:
+        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)
-            else:
-                node_lmp[role].append(new_lmp)
 
     group_count = 0
     for clients in json_jobdata["device_group"]:
@@ -106,7 +107,8 @@
             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]
+            if "lmp_module" in json_jobdata:
+                node_json[role][c]["lmp_module"] = node_lmp[role]
 
             node_json[role][c]["role"] = role
             # multinode node stage 2