HC Test: Improve logging of Honeycomb and VPP restart

Change-Id: I69d73ba3f672af88563715d17c94c73d8d5e7ff2
Signed-off-by: selias <samelias@cisco.com>

diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index c631c37..aecb022 100644 (file)
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -25,6 +25,7 @@ from resources.libraries.python.honeycomb.HoneycombUtil \
     import HoneycombUtil as HcUtil
 from resources.libraries.python.ssh import SSH
 from resources.libraries.python.topology import NodeType
     import HoneycombUtil as HcUtil
 from resources.libraries.python.ssh import SSH
 from resources.libraries.python.topology import NodeType

+from resources.libraries.python.DUTSetup import DUTSetup

 
 
 class HoneycombSetup(object):
 
 
 class HoneycombSetup(object):


@@ -117,7 +118,7 @@ class HoneycombSetup(object):
         """
         logger.console("\nRestarting Honeycomb service ...")
 
         """
         logger.console("\nRestarting Honeycomb service ...")
 

-        cmd = "sudo service honeycomb restart && sudo service vpp restart"
+        cmd = "sudo service honeycomb restart "

         errors = []
 
         for node in nodes:
         errors = []
 
         for node in nodes:


@@ -127,9 +128,14 @@ class HoneycombSetup(object):
                 (ret_code, _, _) = ssh.exec_command_sudo(cmd)
                 if int(ret_code) != 0:
                     errors.append(node['host'])
                 (ret_code, _, _) = ssh.exec_command_sudo(cmd)
                 if int(ret_code) != 0:
                     errors.append(node['host'])

-                else:
-                    logger.info("Restart of Honeycomb and VPP on node {0} is "
-                                "in progress ...".format(node['host']))
+                try:
+                    DUTSetup.setup_dut(node)
+                except Exception as err:
+                    logger.debug(err)
+                    errors.append(node['host'])
+                    continue
+                logger.info("Restart of Honeycomb and VPP on node {0} is "
+                            "in progress ...".format(node['host']))

         if errors:
             raise HoneycombError('Node(s) {0} failed to restart Honeycomb'
                                  ' and/or VPP.'.
         if errors:
             raise HoneycombError('Node(s) {0} failed to restart Honeycomb'
                                  ' and/or VPP.'.