X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=1af8db200a343c1136db8346879bea76f800aaa7;hb=347d1c93a7323c835d17c4cbc5b3c9b60bad3a05;hp=b8174635ba9653b0134c301fbe802741108160db;hpb=857a2a0fcebb17e8fd2e4e7a26aebe173b4595af;p=pyplnet.git diff --git a/plnet.py b/plnet.py index b817463..1af8db2 100755 --- a/plnet.py +++ b/plnet.py @@ -1,11 +1,12 @@ #!/usr/bin/python /usr/bin/plcsh -# $Id$ import os import socket import time import tempfile import errno +import struct +import re import sioc import modprobe @@ -13,10 +14,25 @@ import modprobe global version version = 4.3 +def ovs_check(logger): + """ Return True if openvswitch is running, False otherwise. Try restarting + it once. + """ + rc = os.system("service openvswitch status") + if rc == 0: + return True + logger.log("net: restarting openvswitch") + rc = os.system("service openvswitch restart") + rc = os.system("service openvswitch status") + if rc == 0: + return True + logger.log("net: failed to restart openvswitch") + return False + def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"): global version - sysconfig = "%s/etc/sysconfig/network-scripts" % root + sysconfig = "{}/etc/sysconfig/network-scripts".format(root) try: os.makedirs(sysconfig) except OSError, e: @@ -43,9 +59,9 @@ 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. + # "eth" is not eth0. But, something like eth-4, or eth-12. # This code sorts the interfaces, placing is_primary=True interfaces first. # There is a lot of room for improvement to how this # script handles interfaces and how it chooses the primary interface. @@ -59,10 +75,13 @@ 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) - logger.verbose('net:InitInterfaces ips = %r' % ips) + logger.verbose('net:InitInterfaces interface {}: {}'.format(device_id, interface)) + logger.verbose('net:InitInterfaces macs = {}'.format(macs)) + logger.verbose('net:InitInterfaces ips = {}'.format(ips)) # Get interface name preferably from MAC address, falling back # on IP address. hwaddr=interface['mac'] @@ -74,72 +93,49 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa else: orig_ifname = None - 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'] + if orig_ifname: + logger.verbose('net:InitInterfaces orig_ifname = {}'.format(orig_ifname)) + + 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'] - 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'] - try: - plc.GetInterfaceTags() + if 'interface_tag_ids' in interface: version = 4.3 - except AttributeError: - version = 4.2 - - if 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(interface[interface_tag_ids]) > 0: try: + filter = { interface_tag_id : interface[interface_tag_ids] } if version == 4.3: - settings = plc.GetInterfaceTags({interface_tag_id:interface[interface_tag_ids]}) + settings = plc.GetInterfaceTags(filter) else: - settings = plc.GetNodeNetworkSettings({interface_tag_id:interface[interface_tag_ids]}) + settings = plc.GetNodeNetworkSettings(filter) except: - logger.log("net:InitInterfaces FATAL: failed call GetInterfaceTags({'interface_tag_id':{%s})"% \ - interface['interface_tag_ids']) + logger.log("net:InitInterfaces FATAL: failed call GetInterfaceTags({})" + .format(filter)) failedToGetSettings = True 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'): + if ((settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','VLAN','TYPE','DEVICETYPE')) or \ + (re.search('^IPADDR[0-9]+$|^NETMASK[0-9]+$', settingname))): + # TD: Added match for secondary IPv4 configuration. + details[settingname]=setting['value'] + # IPv6 support on IPv4 interface + elif settingname in ('IPV6ADDR','IPV6_DEFAULTGW','IPV6ADDR_SECONDARIES', 'IPV6_AUTOCONF'): + # TD: Added IPV6_AUTOCONF. details[settingname]=setting['value'] + details['IPV6INIT']='yes' # wireless settings elif settingname in \ [ "MODE", "ESSID", "NW", "FREQ", "CHANNEL", "SENS", "RATE", @@ -147,8 +143,21 @@ 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'] + elif settingname in [ 'OVS_BRIDGE' ]: + # If openvswitch isn't running, then we'll lose network + # connectivity when we reconfigure eth0. + if ovs_check(logger): + details['OVS_BRIDGE'] = setting['value'] + details['TYPE'] = "OVSPort" + details['DEVICETYPE'] = "ovs" + else: + logger.log("net:InitInterfaces ERROR: OVS_BRIDGE specified, yet ovs is not running") else: - logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key]) + logger.log("net:InitInterfaces WARNING: ignored setting named {}" + .format(setting[name_key])) # support aliases to interfaces either by name or HWADDR if 'ALIAS' in details: @@ -158,11 +167,11 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa if hwaddr in macs: hwifname = macs[hwaddr] if ('IFNAME' in details) and details['IFNAME'] <> hwifname: - logger.log("net:InitInterfaces WARNING: alias ifname (%s) and hwaddr ifname (%s) do not match"%\ - (details['IFNAME'],hwifname)) + logger.log("net:InitInterfaces WARNING: alias ifname ({}) and hwaddr ifname ({}) do not match" + .format(details['IFNAME'], hwifname)) details['IFNAME'] = hwifname else: - logger.log('net:InitInterfaces WARNING: mac addr %s for alias not found' %(hwaddr)) + logger.log('net:InitInterfaces WARNING: mac addr {} for alias not found'.format(hwaddr)) if 'IFNAME' in details: # stupid RH /etc/sysconfig/network-scripts/ifup-aliases:new_interface() @@ -174,29 +183,88 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa isValid=isValid and part.isalnum() if isValid: - devices_map["%s:%s" % (details['IFNAME'],details['ALIAS'])] = details + devices_map["{}:{}".format(details['IFNAME'], details['ALIAS'])] = details else: - logger.log("net:InitInterfaces WARNING: interface alias (%s) not a valid string for RH ifup-aliases"% details['ALIAS']) + logger.log("net:InitInterfaces WARNING: interface alias ({}) not a valid string for RH ifup-aliases" + .format(details['ALIAS'])) else: - logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS']) + logger.log("net:InitInterfaces WARNING: interface alias ({}) not matched to an interface" + .format(details['ALIAS'])) device_id -= 1 - else: - if ('IFNAME' not in details) and not orig_ifname: - ifname="eth%d" % (device_id-1) - # should check if $ifname is an eth already defines - if os.path.exists("%s/ifcfg-%s"%(sysconfig,ifname)): - logger.log("net:InitInterfaces WARNING: possibly blowing away %s configuration"%ifname) + 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: - if ('IFNAME' not in details) and orig_ifname: - ifname = orig_ifname - else: - ifname = details['IFNAME'] + bridgeName = details['OVS_BRIDGE'] + bridgeType = 'OVSBridge' + + logger.log('net:InitInterfaces: {} detected. Adding {} to devices_map' + .format(bridgeType, ifname)) + devices_map[ifname] = removeBridgedIfaceDetails(details) + + logger.log('net:InitInterfaces: Adding {} {}'.format(bridgeType, bridgeName)) + bridgeDetails = prepDetails(interface) + + # TD: Add configuration for secondary IPv4 and IPv6 addresses to the bridge. + if len(interface[interface_tag_ids]) > 0: + filter = { interface_tag_id : interface[interface_tag_ids] } + try: + if version == 4.3: + settings = plc.GetInterfaceTags(filter) + else: + settings = plc.GetNodeNetworkSettings(filter) + except: + logger.log("net:InitInterfaces FATAL: failed call GetInterfaceTags({})" + .format(filter)) + failedToGetSettings = True + continue # on to the next interface + + for setting in settings: + settingname = setting[name_key].upper() + if (re.search('^IPADDR[0-9]+$|^NETMASK[0-9]+$', settingname)): + # TD: Added match for secondary IPv4 configuration. + bridgeDetails[settingname]=setting['value'] + # IPv6 support on IPv4 interface + elif settingname in ('IPV6ADDR','IPV6_DEFAULTGW','IPV6ADDR_SECONDARIES', 'IPV6_AUTOCONF'): + # TD: Added IPV6_AUTOCONF. + bridgeDetails[settingname]=setting['value'] + bridgeDetails['IPV6INIT']='yes' + + 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' in details: + ifname = details['IFNAME'] + device_id -= 1 + elif orig_ifname: + ifname = orig_ifname device_id -= 1 + else: + while True: + ifname="eth{}".format(device_id - 1) + if ifname not in devices_map: + break + device_id += 1 + if os.path.exists("{}/ifcfg-{}".format(sysconfig, ifname)): + logger.log("net:InitInterfaces WARNING: possibly blowing away {} configuration" + .format(ifname)) devices_map[ifname] = details - + device_id += 1 + logger.log('net:InitInterfaces: Device map: {}'.format(devices_map)) m = modprobe.Modprobe() try: - m.input("%s/etc/modprobe.conf" % root) + m.input("{}/etc/modprobe.conf".format(root)) except: pass for (dev, details) in devices_map.iteritems(): @@ -209,7 +277,7 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa options=" ".join(driver[1:]) if options <> '': m.optionsset(dev,options) - m.output("%s/etc/modprobe.conf" % root, program) + m.output("{}/etc/modprobe.conf".format(root), program) # clean up after any ifcfg-$dev script that's no longer listed as # part of the Interfaces associated with this node @@ -227,7 +295,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) @@ -238,10 +306,10 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa if not failedToGetSettings: for ifcfg in ifcfgs: dev = ifcfg[len('ifcfg-'):] - path = "%s/ifcfg-%s" % (sysconfig,dev) + path = "{}/ifcfg-{}".format(sysconfig, dev) if not files_only: - logger.verbose("net:InitInterfaces removing %s %s"%(dev,path)) - os.system("/sbin/ifdown %s" % dev) + logger.verbose("net:InitInterfaces removing {} {}".format(dev, path)) + os.system("/sbin/ifdown {}".format(dev)) deletedSomething=True os.unlink(path) @@ -250,75 +318,107 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa time.sleep(2) # Write network configuration file - networkconf = file("%s/etc/sysconfig/network" % root, "w") - networkconf.write("NETWORKING=yes\nHOSTNAME=%s\n" % hostname) - if gateway is not None: - networkconf.write("GATEWAY=%s\n" % gateway) - networkconf.close() + with open("{}/etc/sysconfig/network".format(root), "w") as networkconf: + networkconf.write("NETWORKING=yes\nHOSTNAME={}\n".format(hostname)) + if gateway is not None: + networkconf.write("GATEWAY={}\n".format(gateway)) # 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") f.write("# Autogenerated by pyplnet... do not edit!\n") if 'DRIVER' in details: - f.write("# using %s driver for device %s\n" % (details['DRIVER'],dev)) - f.write('DEVICE=%s\n' % dev) + f.write("# using {} driver for device {}\n".format(details['DRIVER'], dev)) + f.write('DEVICE={}\n'.format(dev)) # 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('{}="{}"\n'.format(key, val)) # print the configuration specific option values (if any) if 'CFGOPTIONS' in details: cfgoptions = details['CFGOPTIONS'] - f.write('#CFGOPTIONS are %s\n' % cfgoptions) + f.write('#CFGOPTIONS are {}\n'.format(cfgoptions)) for cfgoption in cfgoptions.split(): key,val = cfgoption.split('=') key=key.strip() key=key.upper() val=val.strip() - f.write('%s="%s"\n' % (key,val)) + f.write('{}="{}"\n'.format(key, val)) f.close() # compare whether two files are the same def comparefiles(a,b): try: - 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() - fb.close() + logger.verbose("net:InitInterfaces comparing {} with {}".format(a, b)) + if not os.path.exists(a) or not os.path.exists(b): + return False + with open(a) as fb: + buf_a = fb.read() - if not os.path.exists(b): return False - fb = open(b) - buf_b = fb.read() - fb.close() + with open(b) as fb: + buf_b = fb.read() return buf_a == buf_b except IOError, e: return False - path = "%s/ifcfg-%s" % (sysconfig,dev) + 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 {} lookup {}\n".format(details['IPADDR'], table)) + os.close(fd) + rule_dest = "{}/rule-{}".format(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, "{}/{} dev {} table {}\n".format(network, prefix, dev, table)) + os.write(fd, "default via {} dev {} table {}\n".format(details['GATEWAY'], dev, table)) + os.close(fd) + route_dest = "{}/route-{}".format(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 = "{}/ifcfg-{}".format(sysconfig,dev) if not os.path.exists(path): - logger.verbose('net:InitInterfaces adding configuration for %s' % dev) + logger.verbose('net:InitInterfaces adding configuration for {}'.format(dev)) # add ifcfg-$dev configuration file os.rename(tmpnam,path) os.chmod(path,0644) newdevs.append(dev) - elif not comparefiles(tmpnam,path): - logger.verbose('net:InitInterfaces Configuration change for %s' % dev) + elif not comparefiles(tmpnam,path) or src_route_changed: + logger.verbose('net:InitInterfaces Configuration change for {}'.format(dev)) if not files_only: - logger.verbose('net:InitInterfaces ifdown %s' % dev) + logger.verbose('net:InitInterfaces ifdown {}'.format(dev)) # invoke ifdown for the old configuration - os.system("/sbin/ifdown %s" % dev) + os.system("/sbin/ifdown {}".format(dev)) # wait a few secs for ifdown to complete time.sleep(2) - logger.log('replacing configuration for %s' % dev) + logger.log('replacing configuration for {}'.format(dev)) # replace ifcfg-$dev configuration file os.rename(tmpnam,path) os.chmod(path,0644) @@ -329,19 +429,18 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa for dev in newdevs: cfgvariables = {} - fb = file("%s/ifcfg-%s"%(sysconfig,dev),"r") - for line in fb.readlines(): - parts = line.split() - if parts[0][0]=="#":continue - if parts[0].find('='): - name,value = parts[0].split('=') - # clean up name & value - name = name.strip() - value = value.strip() - value = value.strip("'") - value = value.strip('"') - cfgvariables[name]=value - fb.close() + with file("{}/ifcfg-{}".format(sysconfig, dev), "r") as fb: + for line in fb.readlines(): + parts = line.split() + if parts[0][0]=="#":continue + if parts[0].find('='): + name,value = parts[0].split('=') + # clean up name & value + name = name.strip() + value = value.strip() + value = value.strip("'") + value = value.strip('"') + cfgvariables[name]=value def getvar(name): if name in cfgvariables: @@ -357,9 +456,79 @@ 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) + logger.verbose('net:InitInterfaces bringing up {}'.format(dev)) + os.system("/sbin/ifup {}".format(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 {}'.format(bridge)) + os.system("/sbin/ifup {}".format(bridge)) + +## +# Prepare the interface details. +# +def prepDetails(interface, hostname=''): + details = {} + details['ONBOOT'] = 'yes' + details['USERCTL'] = 'no' + # starting with f27, it's OK to use NetworkManager + # attempt to work around issues seen starting with f23 + # details['NM_CONTROLLED'] = '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): + # TD: Also added secondary IPv4 keys and IPv6 keys to the keys to be removed. + allKeys = [ 'PRIMARY', 'PERSISTENT_DHCLIENT', 'DHCLIENTARGS', 'DHCP_HOSTNAME', + 'BOOTPROTO', 'IPADDR', 'NETMASK', 'GATEWAY', 'DNS1', 'DNS2', + 'IPV6ADDR', 'IPV6_DEFAULTGW', 'IPV6ADDR_SECONDARIES', + 'IPV6_AUTOCONF', 'IPV6INIT' ] + for i in range(1, 256): + allKeys.append('IPADDR' + str(i)) + allKeys.append('NETMASK' + str(i)) + + for key in allKeys: + if key in details: + del details[key] + + # TD: Also turn off IPv6 + details['IPV6INIT'] = 'no' + details['IPV6_AUTOCONF'] = 'no' + + return details if __name__ == "__main__": import optparse @@ -375,6 +544,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)