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.
:rtype: str
"""
- if sudo == True:
+ if sudo:
+ ret, stdo, stde = ssh.exec_command_sudo(cmd, timeout=60)
+ else:
+ ret, stdo, stde = ssh.exec_command(cmd, timeout=60)
+
+ if ret != 0:
+ print 'Command execution failed: "{}"'.format(cmd)
+ print 'stdout: {0}'.format(stdo)
+ print 'stderr: {0}'.format(stde)
+ raise RuntimeError('Unexpected ssh command failure')
+
+ 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 0 != ret:
+ if ret != 0:
print 'Command execution failed: "{}"'.format(cmd)
print 'stdout: {0}'.format(stdo)
print 'stderr: {0}'.format(stde)
- raise RuntimeError('Unexpected ssh command failure')
return stdo
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)
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)