X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftopo_installation.py;h=3e3fda864ee7aafd1954934472f69ce93351750e;hp=dc45d23b718c2131e4d93165987fcaf45f506887;hb=4bda4f8b55b0d431b514663e8e90fccd97ad31d4;hpb=b9f10c3229e113bd2b6d7e98594ce96eff8414a9

diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py
index dc45d23b71..3e3fda864e 100755
--- 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
     """
 
-    if sudo == True:
+    if sudo:
         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)
@@ -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,8 +100,20 @@ 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"
+                ret, _, _ = ssh.exec_command(cmd)
+                if ret == 0:
+                    # Try to fix interrupted installations
+                    cmd = 'dpkg --configure -a'
+                    stdout = ssh_no_error(ssh, cmd, sudo=True)
+                    print "###TI {}".format(stdout)
+                    # 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)
@@ -91,6 +125,18 @@ def main():
                     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 fix interrupted installations
+                    cmd = 'dpkg --configure -a'
+                    stdout = ssh_no_error(ssh, cmd, sudo=True)
+                    print "###TI {}".format(stdout)
+                    # 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)