X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=be4e16e1627ccf585b7974cc1870ed7c863c11be;hb=310731475dd01a807c72a92e8549e965f918698a;hp=25f101e99735fcf392bd5129cfe6e8fa282abf80;hpb=5697cb0795d8b4d44b0f65042ae9c6463a7bd681;p=nodemanager.git

diff --git a/net.py b/net.py
index 25f101e..be4e16e 100644
--- a/net.py
+++ b/net.py
@@ -1,18 +1,44 @@
 #
+# $Id$
 #
-#
+
 """network configuration"""
 
-import sioc
-import bwlimit
-import logger
-import string
+# system provided modules
+import os, string, time, socket
+
+# PlanetLab system modules
+import sioc, plnet
+
+# local modules
+import bwlimit, logger, iptables, tools
+
+dev_default = tools.get_default_if()
+
+def start(options, conf):
+    logger.log("net plugin starting up...")
+
+def GetSlivers(data, config, plc):
+    logger.verbose("net:GetSlivers called.")
+    InitInterfaces(plc, data) # writes sysconfig files.
+    if 'OVERRIDES' in dir(config): 
+        if config.OVERRIDES.get('net_max_rate') == '-1':
+            logger.log("net: Slice and node BW Limits disabled.")
+            if len(bwlimit.tc("class show dev %s" % dev_default)): 
+                logger.verbose("*** DISABLING NODE BW LIMITS ***")
+                bwlimit.stop()
+        else:
+            InitNodeLimit(data)
+            InitI2(plc, data)
+    else:
+        InitNodeLimit(data)
+        InitI2(plc, data)
+    InitNAT(plc, data)
 
-def GetSlivers(plc, data):
-    InitNodeLimit(data)
-    InitI2(plc, data)
 
 def InitNodeLimit(data):
+    if not 'networks' in data: return
+
     # query running network interfaces
     devs = sioc.gifconf()
     ips = dict(zip(devs.values(), devs.keys()))
@@ -20,14 +46,14 @@ def InitNodeLimit(data):
     for dev in devs:
         macs[sioc.gifhwaddr(dev).lower()] = dev
 
-    # XXX Exempt Internet2 destinations from node bwlimits
-    # bwlimit.exempt_init('Internet2', internet2_ips)
     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']):
+        hwaddr=network['mac']
+        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr in macs:
+            dev = macs[network['mac']]
+        elif network['ip'] in ips:
             dev = ips[network['ip']]
         else:
             logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac']))
@@ -54,13 +80,83 @@ def InitNodeLimit(data):
             # again, or vice-versa.
 
 def InitI2(plc, data):
+    if not 'groups' in data: return
+
     if "Internet2" in data['groups']:
         logger.log("This is an Internet2 node.  Setting rules.")
         i2nodes = []
         i2nodeids = plc.GetNodeGroups(["Internet2"])[0]['node_ids']
-        for node in plc.GetNodeNetworks({"node_id": i2nodeids}, ["ip"]):
+        for node in plc.GetInterfaces({"node_id": i2nodeids}, ["ip"]):
+            # Get the IPs
             i2nodes.append(node['ip'])
+        # this will create the set if it doesn't already exist
+        # and add IPs that don't exist in the set rather than
+        # just recreateing the set.
         bwlimit.exempt_init('Internet2', i2nodes)
+        
+        # set the iptables classification rule if it doesnt exist.
+        cmd = '-A POSTROUTING -m set --set Internet2 dst -j CLASSIFY --set-class 0001:2000 --add-mark'
+        rules = []
+        ipt = os.popen("/sbin/iptables-save")
+        for line in ipt.readlines(): rules.append(line.strip(" \n"))
+        ipt.close()
+        if cmd not in rules:
+            logger.verbose("net:  Adding iptables rule for Internet2")
+            os.popen("/sbin/iptables -t mangle " + cmd)
+
+def InitNAT(plc, data):
+    if not 'networks' in data: return
+    
+    # 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.
+        hwaddr=network['mac']
+        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr in macs:
+            dev = macs[network['mac']]
+        elif network['ip'] in ips:
+            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.GetInterfaceTags({'interface_tag_id': network['interface_tag_ids']})
+        except:
+            continue
+
+        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 InitInterfaces(plc, data):
+    if not 'networks' in data: return
+    plnet.InitInterfaces(logger, plc, data)
 
 def start(options, config):
     pass