From f2dcf8ccc9789cf22c03bffe15f19fcf71290fdb Mon Sep 17 00:00:00 2001 From: selias Date: Thu, 18 May 2017 13:10:33 +0200 Subject: HC Test: Improve logging of Honeycomb and VPP restart Change-Id: I69d73ba3f672af88563715d17c94c73d8d5e7ff2 Signed-off-by: selias --- resources/libraries/python/honeycomb/HoneycombSetup.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'resources/libraries/python/honeycomb/HoneycombSetup.py') diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index c631c37e95..aecb022314 100644 --- 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 +from resources.libraries.python.DUTSetup import DUTSetup class HoneycombSetup(object): @@ -117,7 +118,7 @@ class HoneycombSetup(object): """ logger.console("\nRestarting Honeycomb service ...") - cmd = "sudo service honeycomb restart && sudo service vpp restart" + cmd = "sudo service honeycomb restart " 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']) - 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.'. -- cgit 1.2.3-korg