aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-10-26 11:48:10 +0200
committerPeter Mikus <pmikus@cisco.com>2016-10-29 13:28:14 +0000
commit8dd0dadbcbe033e8fd8296a8ac6c7a370af10492 (patch)
treee140e7eb5266cf8e92872de16ca9694485168b7b
parent56b9e6c718f331235a3e0c7e1f58ccb46a1a1327 (diff)
topo_installation -c shouldn't fail if rmdir fails
Change-Id: Ie24a1d4f9b8ef698b8dba9d1fcbb32476a1df2bb Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
-rwxr-xr-xresources/tools/topo_installation.py24
1 files changed, 23 insertions, 1 deletions
diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py
index 2931926b15..3e3fda864e 100755
--- a/resources/tools/topo_installation.py
+++ b/resources/tools/topo_installation.py
@@ -47,6 +47,28 @@ 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.
+
+ :param ssh: SSH() object connected to a node.
+ :param cmd: Command line to execute on remote node.
+ :type ssh: SSH() object
+ :type cmd: str
+ :return: stdout from the SSH command.
+ :rtype: str
+ """
+
+ if sudo:
+ ret, stdo, stde = ssh.exec_command_sudo(cmd)
+ else:
+ ret, stdo, stde = ssh.exec_command(cmd)
+
+ if ret != 0:
+ print 'Command execution failed: "{}"'.format(cmd)
+ print 'stdout: {0}'.format(stdo)
+ print 'stderr: {0}'.format(stde)
+
+ return stdo
def main():
"""Copy and installation of VPP packages."""
@@ -78,7 +100,7 @@ def main():
if cancel_installation:
# Remove installation directory on DUT
cmd = "rm -r {}".format(install_dir)
- stdout = ssh_no_error(ssh, cmd)
+ stdout = ssh_ignore_error(ssh, cmd)
print "###TI {}".format(stdout)
cmd = "dpkg -l | grep vpp"