From 0d00f8dd76aebde0f0935ef0821708147623227a Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Tue, 3 May 2011 14:47:05 -0700 Subject: [PATCH] bug 9689: handle old style vm names --- scripts/vm/hypervisor/xenserver/vmops | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index d9aa0131ad9..83f99d39d95 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -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):