aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-05-18 13:10:33 +0200
committerTibor Frank <tifrank@cisco.com>2017-05-22 10:48:27 +0000
commitf2dcf8ccc9789cf22c03bffe15f19fcf71290fdb (patch)
treeb7fad98ee8be89f44d69a55a2a175255d1ff6470 /resources
parent32219bc12fb10a663d2f2372434631e892fc5cb3 (diff)
HC Test: Improve logging of Honeycomb and VPP restart
Change-Id: I69d73ba3f672af88563715d17c94c73d8d5e7ff2 Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/honeycomb/HoneycombSetup.py14
1 files changed, 10 insertions, 4 deletions
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.'.