X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=0f692f4670f9ed0d2e98f54cd6b169b7331a6925;hb=84ebca39ef841949d78ce4266673aa590801b200;hp=129e5bad09438c5da7351395403ae57b6f16ddfc;hpb=b6b71094bb22b2ae358fb6e65396df9b151c3cdc;p=pyplnet.git diff --git a/plnet.py b/plnet.py index 129e5ba..0f692f4 100755 --- a/plnet.py +++ b/plnet.py @@ -77,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, hostname) if 'interface_tag_ids' in interface: version = 4.3 @@ -141,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]) @@ -174,6 +149,22 @@ 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 + 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) + bridgeDetails['TYPE'] = 'Bridge' + devices_map[bridgeName] = bridgeDetails else: if 'IFNAME' in details: ifname = details['IFNAME'] @@ -191,6 +182,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 +216,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 +247,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") @@ -301,10 +294,7 @@ 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) @@ -395,6 +385,52 @@ 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, 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']: + 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 + +## +# 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 @@ -408,6 +444,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"