# HG changeset patch # User Ian Campbell <[email protected]> # Date 1265020755 0 # Node ID d7fc59d6a274334377fdbb09dcaf80a76431bcdb # Parent a6f27b5a3096ce627b5003c7be19ca59f7dd9606 CA-37154: vswitch: Use MAC address of tagged PIF for VLAN fake-bridge
This is because PIF.MAC for a VLAN is FE:FF:FF:FF:FF:FF. In bridge mode the VLAN and the bridge naturally pick up the underlying MAC address from the physical device but under vswitch we must explicitly specify it and we are currently specifying FE:FF:FF:FF:FF. interface-reconfigure needs to use the MAC address of the tagged PIF not the untagged PIF. Signed-off-by: Ian Campbell <[email protected]> diff -r a6f27b5a3096 -r d7fc59d6a274 scripts/InterfaceReconfigureVswitch.py --- a/scripts/InterfaceReconfigureVswitch.py Mon Feb 01 10:39:15 2010 +0000 +++ b/scripts/InterfaceReconfigureVswitch.py Mon Feb 01 10:39:15 2010 +0000 @@ -342,6 +342,7 @@ extra_ports = [] pifrec = db().get_pif_record(self._pif) + dprec = db().get_pif_record(self._dp) ipdev = self._ipdev bridge = pif_bridge_name(self._dp) @@ -369,9 +370,9 @@ cfgmod_argv += ["# reconfigure ipdev %s" % ipdev] cfgmod_argv += ['--add=bridge.%s.port=%s' % (bridge, ipdev)] if bridge == ipdev: - cfgmod_argv += ['--add=bridge.%s.mac=%s' % (bridge, pifrec['MAC'])] + cfgmod_argv += ['--add=bridge.%s.mac=%s' % (bridge, dprec['MAC'])] else: - cfgmod_argv += ['--add=iface.%s.mac=%s' % (ipdev, pifrec['MAC'])] + cfgmod_argv += ['--add=iface.%s.mac=%s' % (ipdev, dprec['MAC'])] if pif_is_vlan(self._pif): cfgmod_argv += ['--add=vlan.%s.tag=%s' % (ipdev, pifrec['VLAN'])] _______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
