X-Git-Url: http://git.onelab.eu/?p=pyplnet.git;a=blobdiff_plain;f=plnet.py;h=b46d720778c25447168b96d93e95eaf0f8d96c7c;hp=84b0791102046c1b719f5b312626669452702233;hb=refs%2Fheads%2Fopenvswitch;hpb=63f646c938175cdfe45a775f909424c5de838556 diff --git a/plnet.py b/plnet.py index 84b0791..b46d720 100755 --- a/plnet.py +++ b/plnet.py @@ -1,11 +1,11 @@ #!/usr/bin/python /usr/bin/plcsh -# $Id$ import os import socket import time import tempfile import errno +import struct import sioc import modprobe @@ -30,16 +30,20 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa for dev in devs: macs[sioc.gifhwaddr(dev).lower()] = dev - # assume data['networks'] contains this node's NodeNetworks - interfaces = {} - interface = 1 + devices_map = {} + device_id = 1 hostname = data.get('hostname',socket.gethostname()) gateway = None - networks = data['networks'] + # assume data['interfaces'] contains this node's Interfaces + # can cope with 4.3 ('networks') or 5.0 ('interfaces') + try: + interfaces = data['interfaces'] + except: + interfaces = data['networks'] failedToGetSettings = False # NOTE: GetInterfaces/NodeNetworks does not necessarily order the interfaces - # returned. Because 'interface'is decremented as each interface is processed, + # returned. Because 'interface' is decremented as each interface is processed, # by the time is_primary=True (primary) interface is reached, the device # "eth%s" % interface, is not eth0. But, something like eth-4, or eth-12. # This code sorts the interfaces, placing is_primary=True interfaces first. @@ -52,150 +56,164 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # NOTE: by sorting on 'is_primary' and then reversing (since False is sorted # before True) all 'is_primary' interfaces are at the beginning of the list. - networks.sort( compare_by('is_primary') ) - networks.reverse() + interfaces.sort( compare_by('is_primary') ) + interfaces.reverse() + + # The names of the bridge devices + bridgeDevices = [] - for network in networks: - logger.verbose('net:InitInterfaces interface %d: %s'%(interface,network)) - logger.verbose('net:InitInterfaces macs = %s' % macs) - logger.verbose('net:InitInterfaces ips = %s' % ips) + for interface in interfaces: + logger.verbose('net:InitInterfaces interface %d: %r'%(device_id,interface)) + logger.verbose('net:InitInterfaces macs = %r' % macs) + logger.verbose('net:InitInterfaces ips = %r' % ips) # Get interface name preferably from MAC address, falling back # on IP address. - hwaddr=network['mac'] + hwaddr=interface['mac'] if hwaddr <> None: hwaddr=hwaddr.lower() if hwaddr in macs: orig_ifname = macs[hwaddr] - elif network['ip'] in ips: - orig_ifname = ips[network['ip']] + elif interface['ip'] in ips: + orig_ifname = ips[interface['ip']] else: orig_ifname = None - if orig_ifname: - logger.verbose('net:InitInterfaces orig_ifname = %s' % orig_ifname) - - inter = {} - inter['ONBOOT']='yes' - inter['USERCTL']='no' - if network['mac']: - inter['HWADDR'] = network['mac'] - if network['is_primary']: - inter['PRIMARY']='yes' - - if network['method'] == "static": - inter['BOOTPROTO'] = "static" - inter['IPADDR'] = network['ip'] - inter['NETMASK'] = network['netmask'] - inter['DNS1'] = network['dns1'] - inter['DNS2'] = network['dns2'] - if network['is_primary']: - gateway = network['gateway'] - - elif network['method'] == "dhcp": - inter['BOOTPROTO'] = "dhcp" - inter['PERSISTENT_DHCLIENT'] = "yes" - if network['hostname']: - inter['DHCP_HOSTNAME'] = network['hostname'] - else: - inter['DHCP_HOSTNAME'] = hostname - if not network['is_primary']: - inter['DHCLIENTARGS'] = "-R subnet-mask" + if orig_ifname: + logger.verbose('net:InitInterfaces orig_ifname = %s' % orig_ifname) - try: - plc.GetInterfaceTags() - version = 4.3 - except AttributeError: - version = 4.2 + details = prepDetails(interface, hostname) + + if interface['is_primary']: + gateway = interface['gateway'] - if version == 4.3: + if 'interface_tag_ids' in interface: + version = 4.3 interface_tag_ids = "interface_tag_ids" interface_tag_id = "interface_tag_id" + name_key = "tagname" else: + version = 4.2 interface_tag_ids = "nodenetwork_setting_ids" interface_tag_id = "nodenetwork_setting_id" + name_key = "name" - if len(network[interface_tag_ids]) > 0: + if len(interface[interface_tag_ids]) > 0: try: if version == 4.3: - settings = plc.GetInterfaceTags({interface_tag_id:network[interface_tag_ids]}) + settings = plc.GetInterfaceTags({interface_tag_id:interface[interface_tag_ids]}) else: - settings = plc.GetNodeNetworkSettings({interface_tag_id:network[interface_tag_ids]}) + settings = plc.GetNodeNetworkSettings({interface_tag_id:interface[interface_tag_ids]}) except: logger.log("net:InitInterfaces FATAL: failed call GetInterfaceTags({'interface_tag_id':{%s})"% \ - network['interface_tag_ids']) + interface[interface_tag_ids]) failedToGetSettings = True - continue # on to the next network + continue # on to the next interface for setting in settings: - # to explicitly set interface name - name_key = "name" - if version == 4.3: - name_key = "tagname" - settingname = setting[name_key].upper() - if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'): - inter[settingname]=setting['value'] + if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','VLAN'): + details[settingname]=setting['value'] + # IPv6 support on IPv4 interface + elif settingname in ('IPV6ADDR','IPV6_DEFAULTGW','IPV6ADDR_SECONDARIES'): + details[settingname]=setting['value'] + details['IPV6INIT']='yes' # wireless settings elif settingname in \ [ "MODE", "ESSID", "NW", "FREQ", "CHANNEL", "SENS", "RATE", "KEY", "KEY1", "KEY2", "KEY3", "KEY4", "SECURITYMODE", "IWCONFIG", "IWPRIV" ] : - inter [settingname] = setting['value'] - inter ['TYPE']='Wireless' + details [settingname] = setting['value'] + details ['TYPE']='Wireless' + # Bridge setting + elif settingname in [ 'BRIDGE' ]: + details['BRIDGE'] = setting['value'] + elif settingname in [ 'OVS_BRIDGE' ]: + details['OVS_BRIDGE'] = setting['value'] + details['TYPE'] = "OVSPort" + details['DEVICETYPE'] = "ovs" else: logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key]) # support aliases to interfaces either by name or HWADDR - if 'ALIAS' in inter: - if 'HWADDR' in inter: - hwaddr = inter['HWADDR'].lower() - del inter['HWADDR'] + if 'ALIAS' in details: + if 'HWADDR' in details: + hwaddr = details['HWADDR'].lower() + del details['HWADDR'] if hwaddr in macs: hwifname = macs[hwaddr] - if ('IFNAME' in inter) and inter['IFNAME'] <> hwifname: + if ('IFNAME' in details) and details['IFNAME'] <> hwifname: logger.log("net:InitInterfaces WARNING: alias ifname (%s) and hwaddr ifname (%s) do not match"%\ - (inter['IFNAME'],hwifname)) - inter['IFNAME'] = hwifname + (details['IFNAME'],hwifname)) + details['IFNAME'] = hwifname else: - logger.log('net:InitInterfaces WARNING: mac addr %s for alias not found' %(hwaddr,alias)) + logger.log('net:InitInterfaces WARNING: mac addr %s for alias not found' %(hwaddr)) - if 'IFNAME' in inter: + if 'IFNAME' in details: # stupid RH /etc/sysconfig/network-scripts/ifup-aliases:new_interface() # checks if the "$DEVNUM" only consists of '^[0-9A-Za-z_]*$'. Need to make # our aliases compliant. - parts = inter['ALIAS'].split('_') + parts = details['ALIAS'].split('_') isValid=True for part in parts: isValid=isValid and part.isalnum() if isValid: - interfaces["%s:%s" % (inter['IFNAME'],inter['ALIAS'])] = inter + devices_map["%s:%s" % (details['IFNAME'],details['ALIAS'])] = details else: - logger.log("net:InitInterfaces WARNING: interface alias (%s) not a valid string for RH ifup-aliases"% inter['ALIAS']) + logger.log("net:InitInterfaces WARNING: interface alias (%s) not a valid string for RH ifup-aliases"% details['ALIAS']) else: - logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% inter['ALIAS']) - interface -= 1 + logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS']) + device_id -= 1 + elif ('BRIDGE' in details or 'OVS_BRIDGE' in details) and 'IFNAME' in details: + # The bridge inherits the mac of the first attached interface. + ifname = details['IFNAME'] + device_id -= 1 + if 'BRIDGE' in details: + bridgeName = details['BRIDGE'] + bridgeType = 'Bridge' + else: + bridgeName = details['OVS_BRIDGE'] + bridgeType = 'OVSBridge' + + logger.log('net:InitInterfaces: %s detected. Adding %s to devices_map' % (bridgeType, ifname)) + devices_map[ifname] = removeBridgedIfaceDetails(details) + + logger.log('net:InitInterfaces: Adding %s %s' % (bridgeType, bridgeName)) + bridgeDetails = prepDetails(interface) + bridgeDevices.append(bridgeName) + bridgeDetails['TYPE'] = bridgeType + if bridgeType == 'OVSBridge': + bridgeDetails['DEVICETYPE'] = 'ovs' + if bridgeDetails['BOOTPROTO'] == 'dhcp': + del bridgeDetails['BOOTPROTO'] + bridgeDetails['OVSBOOTPROTO'] = 'dhcp' + bridgeDetails['OVSDHCPINTERFACES'] = ifname + devices_map[bridgeName] = bridgeDetails else: - if ('IFNAME' not in inter) and not orig_ifname: - ifname="eth%d" % (interface-1) - # should check if $ifname is an eth already defines + if 'IFNAME' in details: + ifname = details['IFNAME'] + device_id -= 1 + elif orig_ifname: + ifname = orig_ifname + device_id -= 1 + else: + while True: + ifname="eth%d" % (device_id-1) + if ifname not in devices_map: + break + device_id += 1 if os.path.exists("%s/ifcfg-%s"%(sysconfig,ifname)): logger.log("net:InitInterfaces WARNING: possibly blowing away %s configuration"%ifname) - else: - if ('IFNAME' not in inter) and orig_ifname: - ifname = orig_ifname - else: - ifname = inter['IFNAME'] - interface -= 1 - interfaces[ifname] = inter - + devices_map[ifname] = details + device_id += 1 + logger.log('net:InitInterfaces: Device map: %r' % devices_map) m = modprobe.Modprobe() try: m.input("%s/etc/modprobe.conf" % root) except: pass - for (dev, inter) in interfaces.iteritems(): + for (dev, details) in devices_map.iteritems(): # get the driver string "moduleName option1=a option2=b" - driver=inter.get('DRIVER','') + driver=details.get('DRIVER','') if driver <> '': driver=driver.split() kernelmodule=driver[0] @@ -206,7 +224,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa m.output("%s/etc/modprobe.conf" % root, program) # clean up after any ifcfg-$dev script that's no longer listed as - # part of the NodeNetworks associated with this node + # part of the Interfaces associated with this node # list all network-scripts files = os.listdir(sysconfig) @@ -221,8 +239,8 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa lo = "ifcfg-lo" if lo in ifcfgs: ifcfgs.remove(lo) - # remove known devices from icfgs list - for (dev, inter) in interfaces.iteritems(): + # remove known devices from ifcfgs list + for (dev, details) in devices_map.iteritems(): ifcfg = 'ifcfg-'+dev if ifcfg in ifcfgs: ifcfgs.remove(ifcfg) @@ -252,22 +270,23 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # Process ifcfg-$dev changes / additions newdevs = [] - for (dev, inter) in interfaces.iteritems(): + table = 10 + for (dev, details) in devices_map.iteritems(): (fd, tmpnam) = tempfile.mkstemp(dir=sysconfig) f = os.fdopen(fd, "w") f.write("# Autogenerated by pyplnet... do not edit!\n") - if 'DRIVER' in inter: - f.write("# using %s driver for device %s\n" % (inter['DRIVER'],dev)) + if 'DRIVER' in details: + f.write("# using %s driver for device %s\n" % (details['DRIVER'],dev)) f.write('DEVICE=%s\n' % dev) # print the configuration values - for (key, val) in inter.iteritems(): - if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'): - f.write('%s=%s\n' % (key, val)) + for (key, val) in details.iteritems(): + if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','GATEWAY'): + f.write('%s="%s"\n' % (key, val)) # print the configuration specific option values (if any) - if 'CFGOPTIONS' in inter: - cfgoptions = inter['CFGOPTIONS'] + if 'CFGOPTIONS' in details: + cfgoptions = details['CFGOPTIONS'] f.write('#CFGOPTIONS are %s\n' % cfgoptions) for cfgoption in cfgoptions.split(): key,val = cfgoption.split('=') @@ -280,7 +299,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # compare whether two files are the same def comparefiles(a,b): try: - logger.verbose("net:InitInterfaces comparing %s with %s" % (a,b)) + logger.verbose("net:InitInterfaces comparing %s with %s" % (a,b)) if not os.path.exists(a): return False fb = open(a) buf_a = fb.read() @@ -295,6 +314,40 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa except IOError, e: return False + src_route_changed = False + if ('PRIMARY' not in details and 'GATEWAY' in details and + details['GATEWAY'] != ''): + table += 1 + (fd, rule_tmpnam) = tempfile.mkstemp(dir=sysconfig) + os.write(fd, "from %s lookup %d\n" % (details['IPADDR'], table)) + os.close(fd) + rule_dest = "%s/rule-%s" % (sysconfig, dev) + if not comparefiles(rule_tmpnam, rule_dest): + os.rename(rule_tmpnam, rule_dest) + os.chmod(rule_dest, 0644) + src_route_changed = True + else: + os.unlink(rule_tmpnam) + (fd, route_tmpnam) = tempfile.mkstemp(dir=sysconfig) + netmask = struct.unpack("I", socket.inet_aton(details['NETMASK']))[0] + ip = struct.unpack("I", socket.inet_aton(details['IPADDR']))[0] + network = socket.inet_ntoa(struct.pack("I", (ip & netmask))) + netmask = socket.ntohl(netmask) + i = 0 + while (netmask & (1 << i)) == 0: + i += 1 + prefix = 32 - i + os.write(fd, "%s/%d dev %s table %d\n" % (network, prefix, dev, table)) + os.write(fd, "default via %s dev %s table %d\n" % (details['GATEWAY'], dev, table)) + os.close(fd) + route_dest = "%s/route-%s" % (sysconfig, dev) + if not comparefiles(route_tmpnam, route_dest): + os.rename(route_tmpnam, route_dest) + os.chmod(route_dest, 0644) + src_route_changed = True + else: + os.unlink(route_tmpnam) + path = "%s/ifcfg-%s" % (sysconfig,dev) if not os.path.exists(path): logger.verbose('net:InitInterfaces adding configuration for %s' % dev) @@ -303,7 +356,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa os.chmod(path,0644) newdevs.append(dev) - elif not comparefiles(tmpnam,path): + elif not comparefiles(tmpnam,path) or src_route_changed: logger.verbose('net:InitInterfaces Configuration change for %s' % dev) if not files_only: logger.verbose('net:InitInterfaces ifdown %s' % dev) @@ -351,10 +404,64 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # handle those correctly if getvar("SLAVE") == 'yes': continue + # Delay bringing up any bridge devices + if dev in bridgeDevices: continue + if not files_only: logger.verbose('net:InitInterfaces bringing up %s' % dev) os.system("/sbin/ifup %s" % dev) + # Bring up the bridge devices + for bridge in bridgeDevices: + if not files_only and bridge in newdevs: + logger.verbose('net:InitInterfaces bringing up bridge %s' % bridge) + os.system("/sbin/ifup %s" % bridge) + +## +# Prepare the interface details. +# +def prepDetails(interface, hostname=''): + details = {} + details['ONBOOT'] = 'yes' + details['USERCTL'] = 'no' + if interface['mac']: + details['HWADDR'] = interface['mac'] + if interface['is_primary']: + details['PRIMARY'] = 'yes' + + if interface['method'] == "static": + details['BOOTPROTO'] = "static" + details['IPADDR'] = interface['ip'] + details['NETMASK'] = interface['netmask'] + details['GATEWAY'] = interface['gateway'] + if interface['is_primary']: + if interface['dns1']: + details['DNS1'] = interface['dns1'] + if interface['dns2']: + details['DNS2'] = interface['dns2'] + + elif interface['method'] == "dhcp": + details['BOOTPROTO'] = "dhcp" + details['PERSISTENT_DHCLIENT'] = "yes" + if interface['hostname']: + details['DHCP_HOSTNAME'] = interface['hostname'] + else: + details['DHCP_HOSTNAME'] = hostname + if not interface['is_primary']: + details['DHCLIENTARGS'] = "-R subnet-mask" + + return details + +## +# Remove duplicate entry from the bridged interface's configuration file. +# +def removeBridgedIfaceDetails(details): + for key in [ 'PRIMARY', 'PERSISTENT_DHCLIENT', 'DHCLIENTARGS', 'DHCP_HOSTNAME', + 'BOOTPROTO', 'IPADDR', 'NETMASK', 'GATEWAY', 'DNS1', 'DNS2' ]: + if key in details: + del details[key] + return details + if __name__ == "__main__": import optparse import sys @@ -369,19 +476,20 @@ if __name__ == "__main__": dest="program", default="plnet") (options, args) = parser.parse_args() if len(args) != 1 or options.root is None: + print sys.argv print >>sys.stderr, "Missing root or node_id" parser.print_help() sys.exit(1) node = shell.GetNodes({'node_id': [int(args[0])]}) try: - networks = shell.GetInterfaces({'interface_id': node[0]['interface_ids']}) + interfaces = shell.GetInterfaces({'interface_id': node[0]['interface_ids']}) except AttributeError: - networks = shell.GetNodeNetworks({'nodenetwork_id':node[0]['nodenetwork_ids']}) + interfaces = shell.GetNodeNetworks({'nodenetwork_id':node[0]['nodenetwork_ids']}) version = 4.2 - data = {'hostname': node[0]['hostname'], 'networks': networks} + data = {'hostname': node[0]['hostname'], 'interfaces': interfaces} class logger: def __init__(self, verbose): self.verbosity = verbose