# HG changeset patch
# User Ben Pfaff <blp@xxxxxxxxxx>
# Date 1278595823 -3600
# Node ID fd0437f4359e47762e6d1712e2daa87a9e00c60e
# Parent 0a8dac27be87e62155ae8b55bf3c1391c56f7674
[PATCH] xenserver: Implement missing interface-reconfigure settings.
>From 47a3c536c345925b6d3837643b0e8a24b752fad3 Mon Sep 17 00:00:00 2001
Date: Tue, 2 Mar 2010 14:52:05 -0800
These settings are supported by the bridge, and they were supported
earlier by the vswitch, but support regressed when OVSDB was initially
introduced because at first ovs-vsctl did not support these settings.
This commit restores support.
Related to bug #2430, #2442.
Signed-off-by: Ben Pfaff <blp@xxxxxxxxxx>
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
...ensource_libexec_InterfaceReconfigureVswitch.py | 68 ++++++++++++++++----
2 files changed, 62 insertions(+), 14 deletions(-)
diff -r 0a8dac27be87 -r fd0437f4359e scripts/InterfaceReconfigureVswitch.py
--- a/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:30:23 2010 +0100
+++ b/scripts/InterfaceReconfigureVswitch.py Thu Jul 08 14:30:23 2010 +0100
@@ -12,6 +12,7 @@
# GNU Lesser General Public License for more details.
#
from InterfaceReconfigure import *
+import re
#
# Bare Network Devices -- network devices without IP configuration
@@ -100,6 +101,30 @@
def datapath_deconfigure_physical(netdev):
return ['--', '--with-iface', '--if-exists', 'del-port', netdev]
+def vsctl_escape(s):
+ if s.isalnum():
+ return s
+
+ def escape(match):
+ c = match.group(0)
+ if c == '\0':
+ raise Error("strings may not contain null bytes")
+ elif c == '\\':
+ return r'\\'
+ elif c == '\n':
+ return r'\n'
+ elif c == '\r':
+ return r'\r'
+ elif c == '\t':
+ return r'\t'
+ elif c == '\b':
+ return r'\b'
+ elif c == '\a':
+ return r'\a'
+ else:
+ return r'\x%02x' % ord(c)
+ return '"' + re.sub(r'["\\\000-\037]', escape, s) + '"'
+
def datapath_configure_bond(pif,slaves):
bridge = pif_bridge_name(pif)
pifrec = db().get_pif_record(pif)
@@ -109,10 +134,6 @@
for slave in slaves:
argv += [pif_netdev_name(slave)]
- # XXX need ovs-vsctl support
- #if pifrec['MAC'] != "":
- # argv += ['--add=port.%s.mac=%s' % (interface, pifrec['MAC'])]
-
# Bonding options.
bond_options = {
"mode": "balance-slb",
@@ -128,10 +149,26 @@
key.startswith("bond-"), oc.items())
overrides = map(lambda (key,val): (key[5:], val), overrides)
bond_options.update(overrides)
+
+ argv += ['--', 'set', 'Port', interface]
+ if pifrec['MAC'] != "":
+ argv += ['MAC=%s' % vsctl_escape(pifrec['MAC'])]
for (name,val) in bond_options.items():
- # XXX need ovs-vsctl support for bond options
- #argv += ["--add=bonding.%s.%s=%s" % (interface, name, val)]
- pass
+ if name in ['updelay', 'downdelay']:
+ # updelay and downdelay have dedicated schema columns.
+ # The value must be a nonnegative integer.
+ try:
+ value = int(val)
+ if value < 0:
+ raise ValueError
+
+ argv += ['bond_%s=%d' % (name, value)]
+ except ValueError:
+ log("bridge %s has invalid %s '%s'" % (bridge, name, value))
+ else:
+ # Pass other bond options into other_config.
+ argv += ["other-config:%s=%s" % (vsctl_escape("bond-%s" % name),
+ vsctl_escape(val))]
return argv
def datapath_deconfigure_bond(netdev):
@@ -278,8 +315,12 @@
return vsctl_argv
def set_br_external_ids(pif):
+ pifrec = db().get_pif_record(pif)
+ dp = pif_datapath(pif)
+ dprec = db().get_pif_record(dp)
+
xs_network_uuids = []
- for nwpif in db().get_pifs_by_device(db().get_pif_record(pif)['device']):
+ for nwpif in db().get_pifs_by_device(pifrec['device']):
rec = db().get_pif_record(nwpif)
# When state is read from dbcache PIF.currently_attached
@@ -295,6 +336,11 @@
vsctl_argv += ['# configure xs-network-uuids']
vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif),
'xs-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
#
@@ -346,12 +392,6 @@
vsctl_argv += ["# reconfigure ipdev %s" % ipdev]
vsctl_argv += ['--', 'add-port', bridge, ipdev]
- # XXX Needs support in ovs-vsctl
- #if bridge == ipdev:
- # vsctl_argv += ['--add=bridge.%s.mac=%s' % (bridge, dprec['MAC'])]
- #else:
- # vsctl_argv += ['--add=iface.%s.mac=%s' % (ipdev, dprec['MAC'])]
-
self._vsctl_argv = vsctl_argv
self._extra_ports = extra_ports
scripts/InterfaceReconfigureVswitch.py | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
xenserver_Implement_missing_interface-reconfigure_settings.patch
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home