Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-138: Cleanup of vpp packages.
[csit.git]
/
resources
/
tools
/
topo_installation.py
diff --git
a/resources/tools/topo_installation.py
b/resources/tools/topo_installation.py
index
dc45d23
..
b052a85
100755
(executable)
--- a/
resources/tools/topo_installation.py
+++ b/
resources/tools/topo_installation.py
@@
-34,12
+34,12
@@
def ssh_no_error(ssh, cmd, sudo=False):
:rtype: str
"""
:rtype: str
"""
- if sudo
== True
:
+ if sudo:
ret, stdo, stde = ssh.exec_command_sudo(cmd)
else:
ret, stdo, stde = ssh.exec_command(cmd)
ret, stdo, stde = ssh.exec_command_sudo(cmd)
else:
ret, stdo, stde = ssh.exec_command(cmd)
- if
0 != ret
:
+ if
ret != 0
:
print 'Command execution failed: "{}"'.format(cmd)
print 'stdout: {0}'.format(stdo)
print 'stderr: {0}'.format(stde)
print 'Command execution failed: "{}"'.format(cmd)
print 'stdout: {0}'.format(stdo)
print 'stderr: {0}'.format(stde)
@@
-80,6
+80,14
@@
def main():
cmd = "rm -r {}".format(install_dir)
stdout = ssh_no_error(ssh, cmd)
print "###TI {}".format(stdout)
cmd = "rm -r {}".format(install_dir)
stdout = ssh_no_error(ssh, cmd)
print "###TI {}".format(stdout)
+
+ cmd = "dpkg -l | grep vpp"
+ ret, _, _ = ssh.exec_command(cmd)
+ if ret == 0:
+ # Try to remove installed vpp.* packages
+ cmd = 'apt-get purge -y "vpp.*"'
+ stdout = ssh_no_error(ssh, cmd, sudo=True)
+ print "###TI {}".format(stdout)
else:
# Create installation directory on DUT
cmd = "mkdir {}".format(install_dir)
else:
# Create installation directory on DUT
cmd = "mkdir {}".format(install_dir)
@@
-91,6
+99,14
@@
def main():
print "###TI scp: {}".format(deb)
ssh.scp(local_path=deb, remote_path=install_dir)
print "###TI scp: {}".format(deb)
ssh.scp(local_path=deb, remote_path=install_dir)
+ cmd = "dpkg -l | grep vpp"
+ ret, _, _ = ssh.exec_command(cmd)
+ if ret == 0:
+ # Try to remove installed vpp.* packages
+ cmd = 'apt-get purge -y "vpp.*"'
+ stdout = ssh_no_error(ssh, cmd, sudo=True)
+ print "###TI {}".format(stdout)
+
# Installation of VPP deb packages
cmd = "dpkg -i --force-all {}/*.deb".format(install_dir)
stdout = ssh_no_error(ssh, cmd, sudo=True)
# Installation of VPP deb packages
cmd = "dpkg -i --force-all {}/*.deb".format(install_dir)
stdout = ssh_no_error(ssh, cmd, sudo=True)