X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=xenserver%2Fopt_xensource_libexec_InterfaceReconfigureVswitch.py;h=9e069f306be5051cd429e712c24f4e2c35589597;hb=31ac1e590b9bb2a2ce7c70cd7c8fd2db0fb8e481;hp=b102886e0cabb89850dcabd18e1a7ee9881d6ceb;hpb=16f2ae571fc7d21f13c9ddbe4e948d8f35552ae5;p=sliver-openvswitch.git diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index b102886e0..9e069f306 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -12,6 +12,7 @@ # GNU Lesser General Public License for more details. # from InterfaceReconfigure import * +import os import re # @@ -90,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): @@ -125,6 +128,9 @@ def vsctl_escape(s): 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) @@ -165,6 +171,28 @@ def datapath_configure_bond(pif,slaves): argv += ['bond_%s=%d' % (name, value)] except ValueError: log("bridge %s has invalid %s '%s'" % (bridge, name, value)) + elif name in ['miimon', 'use_carrier']: + try: + value = int(val) + if value < 0: + raise ValueError + + if name == 'use_carrier': + if value: + value = "carrier" + else: + value = "miimon" + argv += ["other-config:bond-detect-mode=%s" % value] + else: + argv += ["other-config:bond-miimon-interval=%d" % value] + except ValueError: + log("bridge %s has invalid %s '%s'" % (bridge, name, value)) + elif name == "mode": + + if val in ['balance-slb', 'active-backup']: + argv += ['bond_%s=%s' % (name, val)] + else: + log("bridge %s has invalid %s '%s'" % (bridge, name, val)) else: # Pass other bond options into other_config. argv += ["other-config:%s=%s" % (vsctl_escape("bond-%s" % name), @@ -292,15 +320,34 @@ def configure_datapath(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 += ['--', '--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'])] + pool = db().get_pool_record() + network = db().get_network_by_bridge(bridge) + fail_mode = None + valid_fail_modes = ['standalone', 'secure'] + + if network: + network_rec = db().get_network_record(network) + fail_mode = network_rec['other_config'].get('vswitch-controller-fail-mode') + + if (fail_mode not in valid_fail_modes) and pool: + fail_mode = pool['other_config'].get('vswitch-controller-fail-mode') + + if fail_mode not in valid_fail_modes: + fail_mode = 'standalone' + + vsctl_argv += ['--', 'set', 'Bridge', bridge, 'fail_mode=%s' % fail_mode] + vsctl_argv += set_br_external_ids(pif) vsctl_argv += ['## done configuring datapath %s' % bridge] @@ -334,12 +381,17 @@ def set_br_external_ids(pif): # 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']] + + uuid = nwrec['uuid'] + if pif_is_vlan(nwpif): + xs_network_uuids.append(uuid) + else: + xs_network_uuids.insert(0, uuid) vsctl_argv = [] - vsctl_argv += ['# configure network-uuids'] + vsctl_argv += ['# configure xs-network-uuids'] vsctl_argv += ['--', 'br-set-external-id', pif_bridge_name(pif), - 'network-uuids', ';'.join(xs_network_uuids)] + 'xs-network-uuids', ';'.join(xs_network_uuids)] return vsctl_argv @@ -358,6 +410,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") @@ -403,7 +473,26 @@ class DatapathVswitch(Datapath): 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