aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-05-06 15:29:52 +0000
committerPeter Mikus <pmikus@cisco.com>2019-05-09 11:34:01 +0000
commit2e250ffd8711be1247353d403a68573c0d232e8e (patch)
treee70ca7d576635d28ee0175227a5168a94ecbda18 /resources/libraries/python
parente0db487320596ce7fbdd29bd121969878297e12a (diff)
Remove old VPP Restart sequence
Change-Id: I7f71a9709ad55ce03d73e23cc8a9f5064947ed51 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/DUTSetup.py34
1 files changed, 4 insertions, 30 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 7b75df94c8..bd6bb46a42 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=120, 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=120, sudo=True, message=message)
DUTSetup.get_service_logs(node, service)
@@ -161,34 +163,6 @@ class DUTSetup(object):
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.