X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fopt_xensource_libexec_InterfaceReconfigureVswitch.py;h=bc311f80335325a929cbef1c71c3db4440a4d6fa;hb=c259baae45d76592eb14db5abde20aa72e7f2605;hp=c08385918a03ce742f3924ccd6be2766c686d770;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=openvswitch diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index c0838591..bc311f80 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -1,5 +1,5 @@ # Copyright (c) 2008,2009 Citrix Systems, Inc. -# Copyright (c) 2009 Nicira Networks. +# Copyright (c) 2009,2010 Nicira Networks. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published @@ -12,6 +12,8 @@ # GNU Lesser General Public License for more details. # from InterfaceReconfigure import * +import os +import re # # Bare Network Devices -- network devices without IP configuration @@ -36,27 +38,6 @@ def netdev_up(netdev, mtu=None): run_command(["/sbin/ifconfig", netdev, 'up'] + mtu) -# -# Bridges -# - -def pif_bridge_name(pif): - """Return the bridge name of a pif. - - PIF must not be a VLAN and 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: - raise Error("PIF %(uuid)s does not have a bridge name" % pifrec) - # # PIF miscellanea # @@ -89,8 +70,9 @@ def pif_currently_in_use(pif): def pif_datapath(pif): """Return the datapath PIF associated with PIF. -For a non-VLAN PIF, the datapath name is the bridge name. -For a VLAN PIF, the datapath name is the bridge name for the PIF's VLAN slave. +A non-VLAN PIF is its own datapath PIF, except that a bridgeless PIF has +no datapath PIF at all. +A VLAN PIF's datapath PIF is its VLAN slave's datapath PIF. """ if pif_is_vlan(pif): return pif_datapath(pif_get_vlan_slave(pif)) @@ -109,7 +91,9 @@ For a non-VLAN, non-bond master PIF, the PIF is its own physical device PIF. A VLAN PIF cannot be a datapath PIF. """ - if pif_is_vlan(pif): + if pif_is_tunnel(pif): + return [] + elif pif_is_vlan(pif): # Seems like overkill... raise Error("get-physical-pifs should not get passed a VLAN") elif pif_is_bond(pif): @@ -118,21 +102,44 @@ A VLAN PIF cannot be a datapath PIF. return [pif] def datapath_deconfigure_physical(netdev): - return ['--', '--if-exists', 'del-port', 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_tunnel(pif): + pass def datapath_configure_bond(pif,slaves): bridge = pif_bridge_name(pif) - pifrec = db.get_pif_record(pif) + pifrec = db().get_pif_record(pif) interface = pif_netdev_name(pif) argv = ['--', '--fake-iface', 'add-bond', bridge, interface] 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", @@ -148,23 +155,38 @@ def datapath_configure_bond(pif,slaves): 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): - return ['--', '--if-exists', 'del-port', netdev] + return ['--', '--with-iface', '--if-exists', 'del-port', netdev] def datapath_deconfigure_ipdev(interface): - return ['--', '--if-exists', 'del-port', interface] + return ['--', '--with-iface', '--if-exists', 'del-port', interface] def datapath_modify_config(commands): - if debug_mode(): - log("modifying configuration:") - for c in commands: - log(" %s" % c) + #log("modifying configuration:") + #for c in commands: + # log(" %s" % c) rc = run_command(['/usr/bin/ovs-vsctl'] + ['--timeout=20'] + [c for c in commands if not c.startswith('#')]) @@ -177,11 +199,11 @@ def datapath_modify_config(commands): # def configure_datapath(pif): - """Bring up the datapath configuration for PIF. - - Should be careful not to glitch existing users of the datapath, e.g. other VLANs etc. - - Should take care of tearing down other PIFs which encompass common physical devices. + """Bring up the configuration for 'pif', which must not be a VLAN PIF, by: + - Tearing down other PIFs that use the same physical devices as 'pif'. + - Ensuring that 'pif' itself is set up. + - *Not* tearing down any PIFs that are stacked on top of 'pif' (i.e. VLANs + on top of 'pif'. Returns a tuple containing - A list containing the necessary vsctl command line arguments @@ -192,10 +214,13 @@ def configure_datapath(pif): vsctl_argv = [] extra_up_ports = [] + assert not pif_is_vlan(pif) bridge = pif_bridge_name(pif) physical_devices = datapath_get_physical_pifs(pif) + vsctl_argv += ['## configuring datapath %s' % bridge] + # Determine additional devices to deconfigure. # # Given all physical devices which are part of this PIF we need to @@ -265,41 +290,64 @@ def configure_datapath(pif): vsctl_argv += ['# deconfigure physical port %s' % dev] vsctl_argv += datapath_deconfigure_physical(dev) + vsctl_argv += ['--', '--may-exist', 'add-br', bridge] + if len(physical_devices) > 1: vsctl_argv += ['# deconfigure bond %s' % pif_netdev_name(pif)] vsctl_argv += datapath_deconfigure_bond(pif_netdev_name(pif)) vsctl_argv += ['# configure bond %s' % pif_netdev_name(pif)] vsctl_argv += datapath_configure_bond(pif, physical_devices) extra_up_ports += [pif_netdev_name(pif)] - else: + elif len(physical_devices) == 1: iface = pif_netdev_name(physical_devices[0]) vsctl_argv += ['# add physical device %s' % iface] - vsctl_argv += ['--', 'add-port', bridge, iface] + vsctl_argv += ['--', '--may-exist', 'add-port', bridge, iface] + elif pif_is_tunnel(pif): + datapath_configure_tunnel(pif) + + 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] return vsctl_argv,extra_up_ports -def deconfigure_datapath(pif): +def deconfigure_bridge(pif): vsctl_argv = [] bridge = pif_bridge_name(pif) - physical_devices = datapath_get_physical_pifs(pif) + log("deconfigure_bridge: bridge - %s" % bridge) - log("deconfigure_datapath: bridge - %s" % bridge) - log("deconfigure_datapath: physical devices - %s" % [pif_netdev_name(p) for p in physical_devices]) + vsctl_argv += ['# deconfigure bridge %s' % bridge] + vsctl_argv += ['--', '--if-exists', 'del-br', bridge] - for p in physical_devices: - dev = pif_netdev_name(p) - vsctl_argv += ['# deconfigure physical port %s' % dev] - vsctl_argv += datapath_deconfigure_physical(dev) - netdev_down(dev) + return vsctl_argv - if len(physical_devices) > 1: - vsctl_argv += ['# deconfigure bond %s' % pif_netdev_name(pif)] - vsctl_argv += datapath_deconfigure_bond(pif_netdev_name(pif)) +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(pifrec['device']): + rec = db().get_pif_record(nwpif) + + # When state is read from dbcache PIF.currently_attached + # is always assumed to be false... Err on the side of + # listing even detached networks for the time being. + #if nwpif != pif and not rec['currently_attached']: + # log("Network PIF %s not currently attached (%s)" % (rec['uuid'],pifrec['uuid'])) + # continue + nwrec = db().get_network_record(rec['network']) + xs_network_uuids += [nwrec['uuid']] - vsctl_argv += ['# deconfigure bridge %s' % bridge] - vsctl_argv += ['--', '--if-exists', 'del-br', bridge] + vsctl_argv = [] + vsctl_argv += ['# configure xs-network-uuids'] + vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif), + 'xs-network-uuids', ';'.join(xs_network_uuids)] return vsctl_argv @@ -318,6 +366,24 @@ class DatapathVswitch(Datapath): log("Configured for Vswitch datapath") + @classmethod + def rewrite(cls): + if not os.path.exists("/var/run/openvswitch/db.sock"): + # ovsdb-server is not running, so we can't update the database. + # Probably we are being called as part of system shutdown. Just + # skip the update, since the external-ids will be updated on the + # next boot anyhow. + return + + vsctl_argv = [] + for pif in db().get_all_pifs(): + pifrec = db().get_pif_record(pif) + if not pif_is_vlan(pif) and pifrec['currently_attached']: + vsctl_argv += set_br_external_ids(pif) + + if vsctl_argv != []: + datapath_modify_config(vsctl_argv) + def configure_ipdev(self, cfg): cfg.write("TYPE=Ethernet\n") @@ -326,52 +392,63 @@ class DatapathVswitch(Datapath): 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) c,e = configure_datapath(self._dp) + bridge = pif_bridge_name(self._pif) vsctl_argv += c extra_ports += e - if pif_is_vlan(pif): - datapath = pif_datapath(pif) - vsctl_argv += ['--', 'add-br', bridge, datapath, pifrec['VLAN']] - else: - vsctl_argv += ['--', 'add-br', bridge] - - xs_network_uuids = [] - for nwpif in db().get_pifs_by_device(db().get_pif_record(self._pif)['device']): - rec = db().get_pif_record(nwpif) + 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. + vsctl_argv += ['--', '--if-exists', 'del-br', bridge] - # When state is read from dbcache PIF.currently_attached - # is always assumed to be false... Err on the side of - # listing even detached networks for the time being. - #if nwpif != pif and not rec['currently_attached']: - # log("Network PIF %s not currently attached (%s)" % (rec['uuid'],pifrec['uuid'])) - # continue - nwrec = db().get_network_record(rec['network']) - xs_network_uuids += [nwrec['uuid']] + # configure_datapath() set up the underlying datapath bridge. + # Stack a VLAN bridge on top of it. + vsctl_argv += ['--', '--may-exist', 'add-br', + bridge, dpname, pifrec['VLAN']] - vsctl_argv += ['# configure xs-network-uuids'] - vsctl_argv += ['--', 'br-set-external-id', bridge, - 'xs-network-uuids', ';'.join(xs_network_uuids)] + vsctl_argv += set_br_external_ids(self._pif) - vsctl_argv += ["# deconfigure ipdev %s" % ipdev] - vsctl_argv += datapath_deconfigure_ipdev(ipdev) - vsctl_argv += ["# reconfigure ipdev %s" % ipdev] - vsctl_argv += ['--', 'add-port', bridge, ipdev] + if ipdev != bridge: + vsctl_argv += ["# deconfigure ipdev %s" % ipdev] + vsctl_argv += datapath_deconfigure_ipdev(ipdev) + 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, pifrec['MAC'])] - #else: - # vsctl_argv += ['--add=iface.%s.mac=%s' % (ipdev, pifrec['MAC'])] + 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 def bring_down_existing(self): - pass + # interface-reconfigure is never explicitly called to down a + # bond master. However, when we are called to up a slave it + # is implicit that we are destroying the master. Conversely, + # when we are called to up a bond is is implicit that we are + # taking down the slaves. + # + # This is (only) important in the case where the device being + # implicitly taken down uses DHCP. We need to kill the + # dhclient process, otherwise performing the inverse operation + # later later will fail because ifup will refuse to start a + # duplicate dhclient. + bond_masters = pif_get_bond_masters(self._pif) + for master in bond_masters: + log("action_up: bring down bond master %s" % (pif_netdev_name(master))) + run_command(["/sbin/ifdown", pif_bridge_name(master)]) + + bond_slaves = pif_get_bond_slaves(self._pif) + for slave in bond_slaves: + log("action_up: bring down bond slave %s" % (pif_netdev_name(slave))) + run_command(["/sbin/ifdown", pif_bridge_name(slave)]) def configure(self): # Bring up physical devices. ovs-vswitchd initially enables or @@ -381,11 +458,12 @@ class DatapathVswitch(Datapath): physical_devices = datapath_get_physical_pifs(self._dp) for p in physical_devices: - oc = db().get_pif_record(p)['other_config'] + prec = db().get_pif_record(p) + oc = prec['other_config'] dev = pif_netdev_name(p) - mtu = mtu_setting(oc) + mtu = mtu_setting(prec['network'], "PIF", oc) netdev_up(dev, mtu) @@ -412,14 +490,17 @@ class DatapathVswitch(Datapath): #nw = db().get_pif_record(self._pif)['network'] #nwrec = db().get_network_record(nw) - #vsctl_argv += ['# deconfigure xs-network-uuids'] - #vsctl_argv += ['--del-entry=bridge.%s.xs-network-uuids=%s' % (bridge,nwrec['uuid'])] + #vsctl_argv += ['# deconfigure network-uuids'] + #vsctl_argv += ['--del-entry=bridge.%s.network-uuids=%s' % (bridge,nwrec['uuid'])] log("deconfigure ipdev %s on %s" % (ipdev,bridge)) vsctl_argv += ["# deconfigure ipdev %s" % ipdev] vsctl_argv += datapath_deconfigure_ipdev(ipdev) if pif_is_vlan(self._pif): + # Delete the VLAN bridge. + vsctl_argv += deconfigure_bridge(self._pif) + # If the VLAN's slave is attached, leave datapath setup. slave = pif_get_vlan_slave(self._pif) if db().get_pif_record(slave)['currently_attached']: @@ -443,5 +524,13 @@ class DatapathVswitch(Datapath): dp = None if dp: - vsctl_argv += deconfigure_datapath(dp) - datapath_modify_config(vsctl_argv) + vsctl_argv += deconfigure_bridge(dp) + + physical_devices = [pif_netdev_name(p) for p in datapath_get_physical_pifs(dp)] + + log("action_down: bring down physical devices - %s" % physical_devices) + + for p in physical_devices: + netdev_down(p) + + datapath_modify_config(vsctl_argv)