X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDUTSetup.py;h=95b23018af8b6d6db6b5511ee2ad613d8f7f0859;hb=c0b3bda5e9231601459a822bf0c0366c392c2f8b;hp=7b75df94c8b1cc132f5bf616c7acb709e9c30c05;hpb=226758f550b645b7044aa5ecbcef14bb65e80ee5;p=csit.git diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 7b75df94c8..95b23018af 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -76,7 +76,8 @@ class DUTSetup(object): message = 'Node {host} failed to restart service {name}'.\ format(host=node['host'], name=service) - exec_cmd_no_error(node, command, timeout=30, sudo=True, message=message) + exec_cmd_no_error( + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) @@ -110,7 +111,8 @@ class DUTSetup(object): message = 'Node {host} failed to start service {name}'.\ format(host=node['host'], name=service) - exec_cmd_no_error(node, command, timeout=30, sudo=True, message=message) + exec_cmd_no_error( + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) @@ -143,7 +145,8 @@ class DUTSetup(object): message = 'Node {host} failed to stop service {name}'.\ format(host=node['host'], name=service) - exec_cmd_no_error(node, command, timeout=30, sudo=True, message=message) + exec_cmd_no_error( + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) @@ -160,34 +163,6 @@ class DUTSetup(object): if node['type'] == NodeType.DUT: DUTSetup.stop_service(node, service) - @staticmethod - def setup_dut(node): - """Run script over SSH to setup the DUT node. - - :param node: DUT node to set up. - :type node: dict - - :raises Exception: If the DUT setup fails. - """ - command = 'bash {0}/{1}/dut_setup.sh'.\ - format(Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH) - message = 'DUT test setup script failed at node {name}'.\ - format(name=node['host']) - - exec_cmd_no_error(node, command, timeout=120, sudo=True, - message=message) - - @staticmethod - def setup_all_duts(nodes): - """Run script over SSH to setup all DUT nodes. - - :param nodes: Topology nodes. - :type nodes: dict - """ - for node in nodes.values(): - if node['type'] == NodeType.DUT: - DUTSetup.setup_dut(node) - @staticmethod def get_vpp_pid(node): """Get PID of running VPP process.