mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-11 13:57:52 +00:00
Code Issues Releases Wiki Activity

xenserver: Accept VLAN PIFs in pif_bridge_name().

Browse Source 
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 <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2010-02-22 12:53:17 -08:00
parent 7c79588e00
commit 6987c81c05
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
View File

@@ -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: