From 76155d0ab5c9d1808c00dd0d50490b7b18eebca0 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 31 Aug 2011 10:43:32 -0700 Subject: [PATCH] Fix the regression on security group cleanup: In pre-2.2.10, the cleanup doens't work at all. In 2.2.10, it works but make a mistake to delete all the rules for vmname ending with "-untagged" --- scripts/vm/hypervisor/xenserver/vmops | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 8a622e5da63..39fe511691c 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -884,9 +884,11 @@ def cleanup_rules(session, args): if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-', 'l-'] ]: vm = session.xenapi.VM.get_by_name_label(chain) if len(vm) != 1: - util.SMlog("chain " + chain + " does not correspond to a vm, cleaning up") - cleanup.append(chain) - continue + vm = session.xenapi.VM.get_by_name_label(chain + "-untagged") + if len(vm) != 1: + util.SMlog("chain " + chain + " does not correspond to a vm, cleaning up") + cleanup.append(chain) + continue vm_rec = session.xenapi.VM.get_record(vm[0]) state = vm_rec.get('power_state') if state != 'Running' and state != 'Paused':