X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=ad83423c6593d58c348a84f59f35bbae08a34cd6;hb=b68e552baa4681c984beb06038bac318abdf23e8;hp=a99add80ac510510f82ff3146bdd740367ac50a2;hpb=a0f845396341ad2e6a5c258fcc2309aa6d0e1a55;p=pyplnet.git diff --git a/plnet.py b/plnet.py index a99add8..ad83423 100755 --- a/plnet.py +++ b/plnet.py @@ -1,5 +1,4 @@ #!/usr/bin/python /usr/bin/plcsh -# $Id$ import os import socket @@ -44,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. @@ -78,35 +77,7 @@ 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'] - 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" + details = prepDetails(interface) if 'interface_tag_ids' in interface: version = 4.3 @@ -142,6 +113,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]) @@ -175,6 +149,23 @@ 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: + #The bridge inherits the mac of the first attached interface. + if 'IFNAME' in details: + ifname = details['IFNAME'] + device_id -= 1 + elif orig_ifname: + ifname = orig_ifname + device_id -= 1 + if 'PRIMARY' in details: del details['PRIMARY'] + logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname) + devices_map[ifname] = details + bridgeName = details['BRIDGE'] + + logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName) + bridgeDetails = prepDetails(interface) + bridgeDetails['TYPE'] = 'Bridge' + devices_map[bridgeName] = bridgeDetails else: if 'IFNAME' in details: ifname = details['IFNAME'] @@ -192,6 +183,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) @@ -225,7 +217,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) @@ -268,7 +260,7 @@ 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','GATEWAY'): - f.write('%s=%s\n' % (key, val)) + f.write('%s="%s"\n' % (key, val)) # print the configuration specific option values (if any) if 'CFGOPTIONS' in details: @@ -394,6 +386,42 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa logger.verbose('net:InitInterfaces bringing up %s' % dev) os.system("/sbin/ifup %s" % dev) +## +# Prepare the interface details. +# +def prepDetails(interface): + 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']: + 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" + + return details + if __name__ == "__main__": import optparse import sys @@ -407,6 +435,8 @@ if __name__ == "__main__": parser.add_option("-p", "--program", action="store", type="string", dest="program", default="plnet") (options, args) = parser.parse_args() + options.root = '' + options.verbose = True if len(args) != 1 or options.root is None: print sys.argv print >>sys.stderr, "Missing root or node_id"