Increase timeout for 'vpp restart' operations

Systemd first send SIGTERM and wait 90s (default value)
to send SIGKILL to terminate the vpp service.

Change-Id: Ia582cfdc4bebc5d3530e82692856fe733d0b001e
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index e176dd7..78caeb7 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -31,7 +31,7 @@ class DUTSetup(object):
             if node['type'] == NodeType.DUT:
                 ssh.connect(node)
                 (ret_code, stdout, stderr) = \
             if node['type'] == NodeType.DUT:
                 ssh.connect(node)
                 (ret_code, stdout, stderr) = \

-                    ssh.exec_command_sudo('service vpp restart')
+                    ssh.exec_command_sudo('service vpp restart', timeout=120)

                 if int(ret_code) != 0:
                     logger.debug('stdout: {0}'.format(stdout))
                     logger.debug('stderr: {0}'.format(stderr))
                 if int(ret_code) != 0:
                     logger.debug('stdout: {0}'.format(stdout))
                     logger.debug('stderr: {0}'.format(stderr))


@@ -89,7 +89,7 @@ class DUTSetup(object):
 
         (ret_code, stdout, stderr) = \
             ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.format(
 
         (ret_code, stdout, stderr) = \
             ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.format(

-                Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH))
+                Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH), timeout=120)

         logger.trace(stdout)
         logger.trace(stderr)
         if int(ret_code) != 0:
         logger.trace(stdout)
         logger.trace(stderr)
         if int(ret_code) != 0: