X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=8ce9428572bb7ab0f2881b454ae08c2a7300d6fd;hb=7a94db1a3942cc7232bf782bcab86ca83f60d0c3;hp=2aee4ec6388ec75df707fd9e67edbf1aa87fa97e;hpb=a8363e940f827d613b687592558898b77bcd9a64;p=pyplnet.git diff --git a/plnet.py b/plnet.py index 2aee4ec..8ce9428 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 @@ -43,7 +43,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa 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. @@ -59,6 +59,9 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa interfaces.sort( compare_by('is_primary') ) interfaces.reverse() + # The names of the bridge devices + bridgeDevices = [] + for interface in interfaces: logger.verbose('net:InitInterfaces interface %d: %r'%(device_id,interface)) logger.verbose('net:InitInterfaces macs = %r' % macs) @@ -77,35 +80,10 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa if orig_ifname: logger.verbose('net:InitInterfaces orig_ifname = %s' % orig_ifname) - details = {} - details['ONBOOT']='yes' - details['USERCTL']='no' - if interface['mac']: - details['HWADDR'] = interface['mac'] + details = prepDetails(interface, hostname) + 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']: - gateway = interface['gateway'] - 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" + gateway = interface['gateway'] if 'interface_tag_ids' in interface: version = 4.3 @@ -141,6 +119,9 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa "IWCONFIG", "IWPRIV" ] : details [settingname] = setting['value'] details ['TYPE']='Wireless' + # Bridge setting + elif settingname in [ 'BRIDGE' ]: + details['BRIDGE'] = setting['value'] else: logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key]) @@ -174,6 +155,19 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa else: logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS']) device_id -= 1 + elif 'BRIDGE' in details and 'IFNAME' in details: + # The bridge inherits the mac of the first attached interface. + ifname = details['IFNAME'] + device_id -= 1 + logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname) + devices_map[ifname] = removeBridgedIfaceDetails(details) + bridgeName = details['BRIDGE'] + + logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName) + bridgeDetails = prepDetails(interface) + bridgeDevices.append(bridgeName) + bridgeDetails['TYPE'] = 'Bridge' + devices_map[bridgeName] = bridgeDetails else: if 'IFNAME' in details: ifname = details['IFNAME'] @@ -191,6 +185,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa logger.log("net:InitInterfaces WARNING: possibly blowing away %s configuration"%ifname) 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) @@ -224,7 +219,7 @@ 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 + # remove known devices from ifcfgs list for (dev, details) in devices_map.iteritems(): ifcfg = 'ifcfg-'+dev if ifcfg in ifcfgs: ifcfgs.remove(ifcfg) @@ -255,6 +250,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # Process ifcfg-$dev changes / additions newdevs = [] + table = 10 for (dev, details) in devices_map.iteritems(): (fd, tmpnam) = tempfile.mkstemp(dir=sysconfig) f = os.fdopen(fd, "w") @@ -265,8 +261,8 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa # print the configuration values for (key, val) in details.iteritems(): - if key not in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'): - f.write('%s=%s\n' % (key, val)) + 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 details: @@ -279,7 +275,6 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa val=val.strip() f.write('%s="%s"\n' % (key,val)) f.close() - os.close(fd) # compare whether two files are the same def comparefiles(a,b): @@ -302,18 +297,14 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa src_route_changed = False if ('PRIMARY' not in details and 'GATEWAY' in details and details['GATEWAY'] != ''): - i = len(dev) - 1 - while dev[i - 1].isdigit(): - i -= 1 - table = 10 + int(dev[i:]) + 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.unlink(rule_dest) os.rename(rule_tmpnam, rule_dest) - os.chmod(0644, rule_dest) + os.chmod(rule_dest, 0644) src_route_changed = True else: os.unlink(rule_tmpnam) @@ -331,9 +322,8 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa os.close(fd) route_dest = "%s/route-%s" % (sysconfig, dev) if not comparefiles(route_tmpnam, route_dest): - os.unlink(route_dest) os.rename(route_tmpnam, route_dest) - os.chmod(0644, route_dest) + os.chmod(route_dest, 0644) src_route_changed = True else: os.unlink(route_tmpnam) @@ -394,10 +384,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 @@ -412,6 +456,7 @@ 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)