apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-15921 : in 2.1 timeframe, -untagged string is appended to the end of instance name,

Browse Source 
in cleanup_rules function, we need to convert chain name to vm name correclty
This commit is contained in:
Anthony Xu 2012-09-07 17:25:41 -07:00 committed by Alex Huang
parent 625ecc306b
commit 5d5d69cd51
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/vm/hypervisor/xenserver/vmops
View File

@ -1087,17 +1087,13 @@ def cleanup_rules(session, args):
cleaned = 0 cleaned = 0
cleanup = [] cleanup = []
for chain in vmchains: for chain in vmchains:
vm = session.xenapi.VM.get_by_name_label(chain) vmname = chain
if len(vm) != 1: if vmname not in resident_vms:
vm = session.xenapi.VM.get_by_name_label(chain + "-untagged") vmname = chain + "-untagged"
if len(vm) != 1: if vmname not in resident_vms:
util.SMlog("chain " + chain + " does not correspond to a vm, cleaning up") util.SMlog("vm " + chain + " is not running on this host, cleaning up")
cleanup.append(chain) cleanup.append(chain)
continue
if chain not in resident_vms:
util.SMlog("vm " + chain + " is not running, cleaning up")
cleanup.append(chain)
for vm_name in cleanup: for vm_name in cleanup:
destroy_network_rules_for_vm(session, {'vmName':vm_name}) destroy_network_rules_for_vm(session, {'vmName':vm_name})