Merge lp:~fu-wei/lava-dispatcher/multinode into lp:lava-dispatcher/multinode

[Fu Wei]

Fix return message format problem of lava-wait and do some preparation for lava-wait-all

[lp:~fu-wei/lava-dispatcher/multinode]

656. By Neil Williams on 2013-07-03

Fu Wei 2013-07-03 Fix return message format problem of lava-wait and do some prepare for lava-wait-all

=== modified file 'lava_dispatcher/signals/__init__.py'
--- lava_dispatcher/signals/__init__.py	2013-07-03 10:44:31 +0000
+++ lava_dispatcher/signals/__init__.py	2013-07-03 13:15:33 +0000
@@ -206,7 +206,10 @@
         msg={"request": "lava_wait", "messageID": message_id, "message": None}
         reply = self.context.transport(json.dumps(msg))
         logging.debug("Node transport replied with %s" % reply)
-        self.connection.sendline("<LAVA_WAIT_COMPLETE> %s" % json.dumps(reply))
+        message_str = ""
+        for key, value in reply[0].items():
+            message_str += " %s=%s" % (key, value)
+        self.connection.sendline("<LAVA_WAIT_COMPLETE%s>" % message_str)
 
     def _on_WAIT_ALL(self, message_id, role=None):
         if not self.connection:
@@ -216,7 +219,11 @@
         msg={"request": "lava_wait_all", "messageID": message_id, "role": role}
         reply = self.context.transport(json.dumps(msg))
         logging.debug("Node transport replied with %s" % reply)
-        self.connection.sendline("<LAVA_WAIT_ALL_COMPLETE> %s" % json.dumps(reply))
+        message_str = ""
+        #FIXME:this function is Incomplete,we need get target info from reply
+        for key, value in reply[0].items():
+            message_str += " %s:%s=%s" % ("target", key, value)
+        self.connection.sendline("<LAVA_WAIT_ALL_COMPLETE%s>" % message_str)
 
     def postprocess_bundle(self, bundle):
         for test_run in bundle['test_runs']: