From 6987c81c05f21c579fbe60e9b6693862abbbb762 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 22 Feb 2010 12:53:17 -0800 Subject: [PATCH] xenserver: Accept VLAN PIFs in pif_bridge_name(). pif_bridge_name() was written when the vswitch interface-reconfigure was working with the raw Open vSwitch configuration via ovs-cfg-mod. Then, it made no sense to ask for the "bridge name" of a VLAN PIF, because a VLAN PIF didn't have a bridge. Now, however, the vSwitch interface-reconfigure works with ovs-vsctl, which provides a thin layer over the OVS configuration that makes VLAN bridges appear to exist. So now it makes sense to ask for the bridge of a VLAN PIF, and this commit enables that. Signed-off-by: Ben Pfaff --- .../opt_xensource_libexec_InterfaceReconfigureVswitch.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index e938d1a0..f777b178 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -43,15 +43,10 @@ def netdev_up(netdev, mtu=None): def pif_bridge_name(pif): """Return the bridge name of a pif. - PIF must not be a VLAN and must be a bridged PIF.""" + PIF must be a bridged PIF.""" pifrec = db().get_pif_record(pif) - - if pif_is_vlan(pif): - raise Error("PIF %(uuid)s cannot be a bridge, VLAN is %(VLAN)s" % pifrec) - nwrec = db().get_network_record(pifrec['network']) - if nwrec['bridge']: return nwrec['bridge'] else: -- 2.30.2