CSIT-563: HC Test: improved Lisp test coverage

[csit.git] / resources / tools / topo_installation.py

diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py
index 3e3fda8..0488bda 100755 (executable)
--- 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."""
 
@@ -116,7 +119,7 @@ def main():
                     print "###TI {}".format(stdout)
             else:
                 # Create installation directory on DUT
-                cmd = "mkdir {}".format(install_dir)
+                cmd = "rm -r {0}; mkdir {0}".format(install_dir)
                 stdout = ssh_no_error(ssh, cmd)
                 print "###TI {}".format(stdout)