X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=088f9a3111daf5fc3fdbde59af2a3995c1751cde;hb=a90c0e8717a0f18688cc4b63099be35512ff720d;hp=9db7f7314261bc246cdd663b9db4ddddefe4a3e2;hpb=4ac045f44f5ba61bc99178a845616c1ce199e3f8;p=nodemanager.git diff --git a/net.py b/net.py index 9db7f73..088f9a3 100644 --- a/net.py +++ b/net.py @@ -1,13 +1,17 @@ +# +# """network configuration""" import sioc import bwlimit import logger import string +import iptables def GetSlivers(plc, data): InitNodeLimit(data) InitI2(plc, data) + InitNAT(plc, data) def InitNodeLimit(data): # query running network interfaces @@ -59,5 +63,51 @@ def InitI2(plc, data): i2nodes.append(node['ip']) bwlimit.exempt_init('Internet2', i2nodes) +def InitNAT(plc, data): + # query running network interfaces + devs = sioc.gifconf() + ips = dict(zip(devs.values(), devs.keys())) + macs = {} + for dev in devs: + macs[sioc.gifhwaddr(dev).lower()] = dev + + ipt = iptables.IPTables() + for network in data['networks']: + # Get interface name preferably from MAC address, falling + # back on IP address. + if macs.has_key(network['mac']): + dev = macs[network['mac'].lower()] + elif ips.has_key(network['ip']): + dev = ips[network['ip']] + else: + logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac'])) + continue + + try: + settings = plc.GetNodeNetworkSettings({'nodenetwork_setting_id': network['nodenetwork_setting_ids']}) + except: + continue + # XXX arbitrary names + for setting in settings: + if setting['category'].upper() != 'FIREWALL': + continue + if setting['name'].upper() == 'EXTERNAL': + # Enable NAT for this interface + ipt.add_ext(dev) + elif setting['name'].upper() == 'INTERNAL': + ipt.add_int(dev) + elif setting['name'].upper() == 'PF': # XXX Uglier code is hard to find... + for pf in setting['value'].split("\n"): + fields = {} + for field in pf.split(","): + (key, val) = field.split("=", 2) + fields[key] = val + if 'new_dport' not in fields: + fields['new_dport'] = fields['dport'] + if 'source' not in fields: + fields['source'] = "0.0.0.0/0" + ipt.add_pf(fields) + ipt.commit() + def start(options, config): pass