X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=2bd220c019e37461e777ec0244c0b0ab1ec28e8b;hb=956140ef211c9353634c0b4be1c598bf1f3ddfe1;hp=bfd9113a28d86e7ae8ed82ad82f92dedbe8604bd;hpb=a53c6df31a0acdd9a0081d6ded652f6b0d734e54;p=nodemanager.git

diff --git a/net.py b/net.py
index bfd9113..2bd220c 100644
--- a/net.py
+++ b/net.py
@@ -1,10 +1,20 @@
+#
+# $Id$
+#
 """network configuration"""
 
 import sioc
 import bwlimit
 import logger
+import string
+import iptables
 
-def GetSlivers(data):
+def GetSlivers(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()))
@@ -14,16 +24,15 @@ def GetSlivers(data):
 
     # XXX Exempt Internet2 destinations from node bwlimits
     # bwlimit.exempt_init('Internet2', internet2_ips)
-
-    for network in d['networks']:
+    for network in data['networks']:
         # Get interface name preferably from MAC address, falling
         # back on IP address.
-        if macs.has_key(network['mac'].lower()):
+        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' % (self.name, network['ip'], network['mac']))
+            logger.log('%s: no such interface with address %s/%s' % (network['hostname'], network['ip'], network['mac']))
             continue
 
         # Get current node cap
@@ -46,5 +55,60 @@ def GetSlivers(data):
             # 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"]):
+            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.GetInterfaceSettings({'interface_setting_id': network['interface_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