From de19cade393bd9de7ef1d79bb7dbc536d2bca898 Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Fri, 4 Feb 2011 12:00:19 -0800 Subject: [PATCH] bug 8380: default chains weren't getting deleted status 8380: resolved fixed --- scripts/vm/hypervisor/xenserver/vmops | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index d7d344ac4a7..03faedd340e 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -1773,7 +1773,7 @@ def delete_rules_for_vm_in_bridge_firewall_chain(vmName): vm_name = vmName vmchain = vm_name if vm_name.startswith('i-') or vm_name.startswith('r-'): - vmchain = '-'.join(vm_name.split('-')[:-1]) + vmchain = '-'.join(vm_name.split('-')[:-2]) delcmd = "iptables -S BRIDGE-FIREWALL | grep " + vmchain + " | sed 's/-A/-D/'" delcmds = util.pread2(['/bin/bash', '-c', delcmd]).split('\n') @@ -1930,7 +1930,7 @@ def cleanup_rules_for_dead_vms(session): @echo def cleanup_rules(session, args): try: - chainscmd = "iptables-save | grep '^:' | grep -v '.*-def' | awk '{print $1}' | cut -d':' -f2" + chainscmd = "iptables-save | grep '^:' | awk '{print $1}' | cut -d':' -f2 | sed 's/-def/-VM/'|sort|uniq" chains = util.pread2(['/bin/bash', '-c', chainscmd]).split('\n') cleaned = 0 cleanup = []