X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftopo_installation.py;h=3a983962ad79b016391f5f27e0e7ff4fa8953138;hp=3e3fda864ee7aafd1954934472f69ce93351750e;hb=a70972124d9774c60e6b1d2d8c43662f71ff35ae;hpb=8dd0dadbcbe033e8fd8296a8ac6c7a370af10492 diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py index 3e3fda864e..3a983962ad 100755 --- a/resources/tools/topo_installation.py +++ b/resources/tools/topo_installation.py @@ -22,6 +22,7 @@ from yaml import load from resources.libraries.python.ssh import SSH + def ssh_no_error(ssh, cmd, sudo=False): """Execute a command over ssh channel, and log and exit if the command fails. @@ -35,9 +36,9 @@ def ssh_no_error(ssh, cmd, sudo=False): """ if sudo: - ret, stdo, stde = ssh.exec_command_sudo(cmd) + ret, stdo, stde = ssh.exec_command_sudo(cmd, timeout=60) else: - ret, stdo, stde = ssh.exec_command(cmd) + ret, stdo, stde = ssh.exec_command(cmd, timeout=60) if ret != 0: print 'Command execution failed: "{}"'.format(cmd) @@ -47,6 +48,7 @@ def ssh_no_error(ssh, cmd, sudo=False): return stdo + def ssh_ignore_error(ssh, cmd, sudo=False): """Execute a command over ssh channel, ignore errors. @@ -70,6 +72,7 @@ def ssh_ignore_error(ssh, cmd, sudo=False): return stdo + def main(): """Copy and installation of VPP packages."""