[lnst] NetTestController: accept new result dictionaries

[Jiří Pírko]

commit 47ea76da28213d999b2cb17b79bbe884a7ff37db
Author: Ondrej Lichtner <olichtne(a)redhat.com&gt;
Date:   Wed Sep 4 13:36:04 2013 +0200

    NetTestController: accept new result dictionaries
    
    The controller will now use the new format of the command result
    dictionaries and print them to the logs during recipe execution.
    
    Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
    Signed-off-by: Jiri Pirko <jiri(a)resnulli.us&gt;

 lnst/Controller/NetTestController.py |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index a5b2c2f..c7d1fab 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -35,6 +35,7 @@ from lnst.Common.ConnectionHandler import send_data, recv_data
 from lnst.Common.ConnectionHandler import ConnectionHandler
 from lnst.Common.Config import lnst_config
 from lnst.Common.RecipePath import RecipePath
+from lnst.Common.Colours import decorate_with_preset
 import lnst.Controller.Task as Task
 
 class NetTestError(Exception):
@@ -508,13 +509,17 @@ class NetTestController:
             if self._res_serializer:
                 self._res_serializer.add_cmd_result(command, cmd_res)
 
-        logging.debug("Result: %s", str(cmd_res))
-        if "res_data" in cmd_res:
-            res_data = pformat(cmd_res["res_data"])
-            logging.info("Result data: %s", (res_data))
-        if not cmd_res["passed"]:
-            logging.error("Command failed: [%s], Error message:
\"%s\"",
-                          str_command(command), cmd_res["err_msg"])
+        if cmd_res["passed"]:
+            res_str = decorate_with_preset("PASS", "pass")
+        else:
+            res_str = decorate_with_preset("FAIL", "fail")
+        logging.info("Result: %s" % res_str)
+        if "report" in cmd_res and cmd_res["report"] !=
"":
+            logging.info("Result data:")
+            for line in cmd_res["report"].splitlines():
+                logging.info(4*" " + line)
+        if "msg" in cmd_res and cmd_res["msg"] != "":
+            logging.info("Status message from slave: \"%s\"" %
cmd_res["msg"])
 
         return cmd_res