From 233fc0f58253694e8fc5417146758821b1c34e05 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 7 Oct 2019 13:40:49 +0000 Subject: [PATCH] FIX: Add SRIOV cleanup Signed-off-by: Peter Mikus Change-Id: I344cbab78e1491b1dc0b64598f1eae23c8d2cdcf --- resources/tools/scripts/topo_cleanup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/tools/scripts/topo_cleanup.py b/resources/tools/scripts/topo_cleanup.py index bf4bdfc557..89055944c5 100755 --- a/resources/tools/scripts/topo_cleanup.py +++ b/resources/tools/scripts/topo_cleanup.py @@ -46,6 +46,7 @@ def execute_command_ssh(ssh, cmd, sudo=False): return ret, stdout, stdout + def uninstall_package(ssh, package): """If there are packages installed, clean them up. @@ -64,6 +65,7 @@ def uninstall_package(ssh, package): execute_command_ssh(ssh, 'apt-get purge -y "*{package}*"'.format( package=package), sudo=True) + def kill_process(ssh, process): """If there are running processes, kill them. @@ -126,9 +128,9 @@ def main(): for interface in topology[node]['interfaces']: pci = topology[node]['interfaces'][interface]['pci_address'] execute_command_ssh( - ssh, "ip link set " - "$(basename /sys/bus/pci/devices/{pci}/net/*) down". - format(pci=pci), sudo=True) + ssh, "[[ -d {path}/{pci}/net ]] && " + "sudo ip link set $(basename {path}/{pci}/net/*) down". + format(pci=pci, path='/sys/bus/pci/devices')) if __name__ == "__main__": -- 2.16.6