From d01411c3c4af6c724a3800c621804ea979818d6d Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 10 Oct 2019 15:31:28 +0000 Subject: Cleanup via Ansible + Remove dependency on topo_ scripts that depends on custom SSH() that depends on framework itself. This way the cleanup is independent of failure in our SSH libs. + Simple ansible command can do cleanup of a machine: ansible-playbook --inventory inventories/lf_inventory/hosts site.yaml \ --limit '10.32.8.18' --tags 'cleanup' + Add vpp_device reset and cleanup. + Remove historical scripts. - Still in testing beta phase. - Need to add SRIOV cleanup. Signed-off-by: Peter Mikus Change-Id: I68e23304c7ad01041f51263c328c6e8d9b555cb7 --- resources/tools/scripts/topo_installation.py | 171 --------------------------- 1 file changed, 171 deletions(-) delete mode 100755 resources/tools/scripts/topo_installation.py (limited to 'resources/tools/scripts/topo_installation.py') diff --git a/resources/tools/scripts/topo_installation.py b/resources/tools/scripts/topo_installation.py deleted file mode 100755 index 5c91abbd0f..0000000000 --- a/resources/tools/scripts/topo_installation.py +++ /dev/null @@ -1,171 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script provides copy and installation of VPP build deb packages. - As destinations are used all DUT nodes from the topology file.""" - -import sys -import argparse -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. - - :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, 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 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.""" - - parser = argparse.ArgumentParser() - parser.add_argument("-t", "--topo", required=True, - help="Topology file") - parser.add_argument("-d", "--directory", required=True, - help="Installation directory") - parser.add_argument("-p", "--packages", required=False, nargs='+', - help="Packages paths to copy") - parser.add_argument("-c", "--cancel", help="Cancel installation", - action="store_true") - parser.add_argument("-hc", "--honeycomb", help="Include Honeycomb package.", - required=False, default=False) - - args = parser.parse_args() - topology_file = args.topo - packages = args.packages - install_dir = args.directory - cancel_installation = args.cancel - honeycomb = args.honeycomb - - work_file = open(topology_file) - topology = load(work_file.read())['nodes'] - - def fix_interrupted(package): - """If there are interrupted installations, clean them up.""" - - cmd = "dpkg -l | grep {0}".format(package) - 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 packages - cmd = 'apt-get purge -y "{0}.*"'.format(package) - stdout = ssh_no_error(ssh, cmd, sudo=True) - print "###TI {}".format(stdout) - - ssh = SSH() - for node in topology: - if topology[node]['type'] == "DUT": - print "###TI host: {}".format(topology[node]['host']) - ssh.connect(topology[node]) - - if cancel_installation: - # Remove installation directory on DUT - cmd = "rm -r {}".format(install_dir) - stdout = ssh_ignore_error(ssh, cmd) - print "###TI {}".format(stdout) - - if honeycomb: - fix_interrupted("honeycomb") - # remove HC logs - cmd = "rm -rf /var/log/honeycomb" - stdout = ssh_ignore_error(ssh, cmd, sudo=True) - print "###TI {}".format(stdout) - fix_interrupted("vpp") - - else: - # Create installation directory on DUT - cmd = "rm -r {0}; mkdir {0}".format(install_dir) - stdout = ssh_no_error(ssh, cmd) - print "###TI {}".format(stdout) - - if honeycomb: - smd = "ls ~/honeycomb | grep .deb" - stdout = ssh_ignore_error(ssh, smd) - if "honeycomb" in stdout: - # If custom honeycomb packages exist, use them - cmd = "cp ~/honeycomb/*.deb {0}".format(install_dir) - stdout = ssh_no_error(ssh, cmd) - print "###TI {}".format(stdout) - else: - # Copy packages from local path to installation dir - for deb in packages: - print "###TI scp: {}".format(deb) - ssh.scp(local_path=deb, remote_path=install_dir) - else: - # Copy packages from local path to installation dir - for deb in packages: - print "###TI scp: {}".format(deb) - ssh.scp(local_path=deb, remote_path=install_dir) - - if honeycomb: - fix_interrupted("honeycomb") - fix_interrupted("vpp") - - # Installation of deb packages - cmd = "dpkg -i --force-all {}/*.deb".format(install_dir) - stdout = ssh_no_error(ssh, cmd, sudo=True) - print "###TI {}".format(stdout) - -if __name__ == "__main__": - sys.exit(main()) -- cgit 1.2.3-korg