X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=bb60f1fd40282d4cc859be0df89c2da8b18afac7;hb=0b33147b732e26a07d2566346908e3c0fb026dfc;hp=84cde401f8654649ea0126f4311789b995e0172d;hpb=76340d291da678c66699d74ee7f2be19c31300f0;p=nodemanager.git

diff --git a/net.py b/net.py
index 84cde40..bb60f1f 100644
--- a/net.py
+++ b/net.py
@@ -1,10 +1,23 @@
+#
+# $Id$
+#
 """network configuration"""
 
 import sioc
 import bwlimit
 import logger
+import string
+import iptables
+import os
+import plnet
 
-def GetSlivers(data):
+def GetSlivers(plc, data):
+    InitInterfaces(plc, data)
+    InitNodeLimit(data)
+    InitI2(plc, data)
+    InitNAT(plc, data)
+
+def InitNodeLimit(data):
     # query running network interfaces
     devs = sioc.gifconf()
     ips = dict(zip(devs.values(), devs.keys()))
@@ -12,40 +25,110 @@ def GetSlivers(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 d in data:
-        for network in d['networks']:
-            # Get interface name preferably from MAC address, falling
-            # back on IP address.
-            if macs.has_key(network['mac'].lower()):
-                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' % (self.name, network['ip'], network['mac']))
+    for network in data['networks']:
+        # Get interface name preferably from MAC address, falling
+        # back on IP address.
+        if macs.has_key(network['mac'].lower()):
+            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
+
+        # Get current node cap
+        try:
+            old_bwlimit = bwlimit.get_bwcap(dev)
+        except:
+            old_bwlimit = None
+
+        # Get desired node cap
+        if network['bwlimit'] is None or network['bwlimit'] < 0:
+            new_bwlimit = bwlimit.bwmax
+        else:
+            new_bwlimit = network['bwlimit']
+
+        if old_bwlimit != new_bwlimit:
+            # Reinitialize bandwidth limits
+            bwlimit.init(dev, new_bwlimit)
+
+            # XXX This should trigger an rspec refresh in case
+            # some previously invalid sliver bwlimit is now valid
+            # again, or vice-versa.
+
+def InitI2(plc, data):
+    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.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):
+    # 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.GetInterfaceTags({'interface_tag_id': network['interface_tag_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()
 
-            # Get current node cap
-            try:
-                old_bwlimit = bwlimit.get_bwcap(dev)
-            except:
-                old_bwlimit = None
-
-            # Get desired node cap
-            if network['bwlimit'] is None or network['bwlimit'] < 0:
-                new_bwlimit = bwlimit.bwmax
-            else:
-                new_bwlimit = network['bwlimit']
-
-            if old_bwlimit != new_bwlimit:
-                # Reinitialize bandwidth limits
-                bwlimit.init(dev, new_bwlimit)
-
-                # XXX This should trigger an rspec refresh in case
-                # some previously invalid sliver bwlimit is now valid
-                # again, or vice-versa.
+def InitInterfaces(plc, data):
+    if not 'networks' in data:
+        return
+    plnet.InitInterfaces(logger, plc, data)
 
 def start(options, config):
     pass