projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-openflowd: Remove documentation for obsolete --mgmt-id option.
[openvswitch]
/
xenserver
/
opt_xensource_libexec_InterfaceReconfigureVswitch.py
diff --git
a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index 6b60cb073e81b8608cb9252fe1b17a5c55af495e..b102886e0cabb89850dcabd18e1a7ee9881d6ceb 100644
(file)
--- a/
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@
-297,6
+297,10
@@
def configure_datapath(pif):
vsctl_argv += ['# add physical device %s' % iface]
vsctl_argv += ['--', '--may-exist', 'add-port', bridge, iface]
vsctl_argv += ['# add physical device %s' % iface]
vsctl_argv += ['--', '--may-exist', 'add-port', bridge, iface]
+ vsctl_argv += ['# configure Bridge MAC']
+ vsctl_argv += ['--', 'set', 'Bridge', bridge,
+ 'other-config:hwaddr=%s' % vsctl_escape(db().get_pif_record(pif)['MAC'])]
+
vsctl_argv += set_br_external_ids(pif)
vsctl_argv += ['## done configuring datapath %s' % bridge]
vsctl_argv += set_br_external_ids(pif)
vsctl_argv += ['## done configuring datapath %s' % bridge]
@@
-337,10
+341,6
@@
def set_br_external_ids(pif):
vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif),
'network-uuids', ';'.join(xs_network_uuids)]
vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif),
'network-uuids', ';'.join(xs_network_uuids)]
- vsctl_argv += ['# configure MAC']
- vsctl_argv += ['--', 'set', 'Interface', pif_ipdev_name(pif),
- 'MAC=%s' % vsctl_escape(dprec['MAC'])]
-
return vsctl_argv
#
return vsctl_argv
#
@@
-374,6
+374,8
@@
class DatapathVswitch(Datapath):
vsctl_argv += c
extra_ports += e
vsctl_argv += c
extra_ports += e
+ dpname = pif_bridge_name(self._dp)
+
if pif_is_vlan(self._pif):
# XXX this is only needed on XS5.5, because XAPI misguidedly
# creates the fake bridge (via bridge ioctl) before it calls us.
if pif_is_vlan(self._pif):
# XXX this is only needed on XS5.5, because XAPI misguidedly
# creates the fake bridge (via bridge ioctl) before it calls us.
@@
-382,7
+384,7
@@
class DatapathVswitch(Datapath):
# configure_datapath() set up the underlying datapath bridge.
# Stack a VLAN bridge on top of it.
vsctl_argv += ['--', '--may-exist', 'add-br',
# configure_datapath() set up the underlying datapath bridge.
# Stack a VLAN bridge on top of it.
vsctl_argv += ['--', '--may-exist', 'add-br',
- bridge,
pif_bridge_name(self._dp)
, pifrec['VLAN']]
+ bridge,
dpname
, pifrec['VLAN']]
vsctl_argv += set_br_external_ids(self._pif)
vsctl_argv += set_br_external_ids(self._pif)
@@
-392,6
+394,11
@@
class DatapathVswitch(Datapath):
vsctl_argv += ["# reconfigure ipdev %s" % ipdev]
vsctl_argv += ['--', 'add-port', bridge, ipdev]
vsctl_argv += ["# reconfigure ipdev %s" % ipdev]
vsctl_argv += ['--', 'add-port', bridge, ipdev]
+ if ipdev != dpname:
+ vsctl_argv += ['# configure Interface MAC']
+ vsctl_argv += ['--', 'set', 'Interface', pif_ipdev_name(self._pif),
+ 'MAC=%s' % vsctl_escape(dprec['MAC'])]
+
self._vsctl_argv = vsctl_argv
self._extra_ports = extra_ports
self._vsctl_argv = vsctl_argv
self._extra_ports = extra_ports