X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;fp=net.py;h=0000000000000000000000000000000000000000;hb=b994d0a94352d9c4f3fc430c317f7a37dd3414d4;hp=0c8b3573169e1d9a4d6d5405175717cc64f1b0de;hpb=4742191a6cd97f84c9f03cbc0663c8dcb63b69cb;p=nodemanager.git

diff --git a/net.py b/net.py
deleted file mode 100644
index 0c8b357..0000000
--- a/net.py
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# $Id$
-#
-
-"""network configuration"""
-
-# system provided modules
-import os, string, time, socket
-
-# PlanetLab system modules
-import sioc, plnet
-
-# local modules
-import bwlimit, logger, iptables
-
-def GetSlivers(plc, data, config):
-    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 eth0")): 
-                logger.verbose("*** DISABLING NODE BW LIMITS ***")
-                bwlimit.stop()
-        else:
-            InitNodeLimit(data)
-            InitI2(plc, data)
-    else:
-        InitNodeLimit(data)
-        InitI2(plc, data)
-    InitNAT(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()))
-    macs = {}
-    for dev in devs:
-        macs[sioc.gifhwaddr(dev).lower()] = dev
-
-    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
-
-        # 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 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.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