bug 9689: handle old style vm names

This commit is contained in:
Chiradeep Vittal 2011-05-03 14:47:05 -07:00
parent aecd64e51c
commit 4ab68bd44a
1 changed files with 10 additions and 6 deletions

View File

@ -356,14 +356,18 @@ def get_private_nic(session, args):
return mgmtnic
def chain_name(vm_name):
if vm_name.startswith('i-') or vm_name.startswith('r-'):
return '-'.join(vm_name.split('-'))
return vm_name
if vm_name.startswith('i-') or vm_name.startswith('r-'):
if vm_name.endswith('untagged'):
return '-'.join(vm_name.split('-')[:-1])
return '-'.join(vm_name.split('-'))
return vm_name
def chain_name_def(vm_name):
if vm_name.startswith('i-') or vm_name.startswith('r-'):
return '-'.join(vm_name.split('-')[:-1]) + "-def"
return vm_name
if vm_name.startswith('i-') or vm_name.startswith('r-'):
if vm_name.endswith('untagged'):
return '-'.join(vm_name.split('-')[:-2]) + "-def"
return '-'.join(vm_name.split('-')[:-1]) + "-def"
return vm_name
@echo
def can_bridge_firewall(session, args):