git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Upgrade daemon module to argparse.
[sliver-openvswitch.git]
/
xenserver
/
opt_xensource_libexec_InterfaceReconfigureBridge.py
diff --git
a/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
b/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
index
0438f5c
..
a93e438
100644
(file)
--- a/
xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
+++ b/
xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py
@@
-274,7
+274,8
@@
def _configure_physical_interface(pif):
f.write("TYPE=Ethernet\n")
f.write("HWADDR=%(MAC)s\n" % pifrec)
f.write("TYPE=Ethernet\n")
f.write("HWADDR=%(MAC)s\n" % pifrec)
- settings,offload = ethtool_settings(pifrec['other_config'])
+ settings,offload = ethtool_settings(pifrec['other_config'],
+ PIF_OTHERCONFIG_DEFAULTS)
if len(settings):
f.write("ETHTOOL_OPTS=\"%s\"\n" % str.join(" ", settings))
if len(offload):
if len(settings):
f.write("ETHTOOL_OPTS=\"%s\"\n" % str.join(" ", settings))
if len(offload):
@@
-338,7
+339,7
@@
def _configure_bond_interface(pif):
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
- mtu = mtu_setting(pifrec['network'], "
VLAN
-PIF", pifrec['other_config'])
+ mtu = mtu_setting(pifrec['network'], "
Bond
-PIF", pifrec['other_config'])
if mtu:
f.write("MTU=%s\n" % mtu)
if mtu:
f.write("MTU=%s\n" % mtu)
@@
-349,6
+350,7
@@
def _configure_bond_interface(pif):
"downdelay": "200",
"updelay": "31000",
"use_carrier": "1",
"downdelay": "200",
"updelay": "31000",
"use_carrier": "1",
+ "hashing-algorithm": "src_mac",
}
# override defaults with values from other-config whose keys being with "bond-"
}
# override defaults with values from other-config whose keys being with "bond-"
@@
-388,7
+390,7
@@
def _configure_vlan_interface(pif):
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
if len(offload):
f.write("ETHTOOL_OFFLOAD_OPTS=\"%s\"\n" % str.join(" ", offload))
- mtu = mtu_setting(pifrec['network'], "
Bond
-PIF", pifrec['other_config'])
+ mtu = mtu_setting(pifrec['network'], "
VLAN
-PIF", pifrec['other_config'])
if mtu:
f.write("MTU=%s\n" % mtu)
if mtu:
f.write("MTU=%s\n" % mtu)
@@
-423,6
+425,9
@@
def _configure_pif(pif):
class DatapathBridge(Datapath):
def __init__(self, pif):
class DatapathBridge(Datapath):
def __init__(self, pif):
+ if pif_is_tunnel(pif):
+ raise Error("Tunnel PIFs are not supported in Bridge mode")
+
Datapath.__init__(self, pif)
log("Configured for Bridge datapath")
Datapath.__init__(self, pif)
log("Configured for Bridge datapath")