etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

in cleanup_rules function, we need to convert chain name to vm name correclty
This commit is contained in:
Anthony Xu 2012-08-20 17:54:17 -07:00
parent 7d0d04946b
commit 6d06b84879
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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