reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / net.py

diff --git a/net.py b/net.py
index 760c1be..7756d6b 100644 (file)
--- a/net.py
+++ b/net.py
@@ -1,35 +1,53 @@
-# $Id$
-# $URL$
-
-"""network configuration"""
+"""
+network configuration
+"""
 
 # system provided modules
-import os, string, time, socket
+import os
 
 # PlanetLab system modules
 import sioc, plnet
 
 # local modules
-import bwlimit, logger, iptables, tools
+import plnode.bwlimit as bwlimit
+import logger
+import iptables
+import tools
 
 # we can't do anything without a network
-priority=1
+priority = 1
 
 dev_default = tools.get_default_if()
 
-def start(options, conf):
+
+def start():
     logger.log("net: plugin starting up...")
 
 def GetSlivers(data, config, plc):
+    # added by caglar
+    # band-aid for short period as old API returns networks instead of interfaces
+    global KEY_NAME
+    KEY_NAME = "interfaces"
+    #################
+
     logger.verbose("net: GetSlivers called.")
-    if not 'interfaces' in data: 
-        logger.log_missing_data('net.GetSlivers','interfaces')
-        return
+    if not 'interfaces' in data:
+        # added by caglar
+        # band-aid for short period as old API returns networks instead of interfaces
+        # logger.log_missing_data('net.GetSlivers', 'interfaces')
+        # return
+        if not 'networks' in data:
+            logger.log_missing_data('net.GetSlivers', 'interfaces')
+            return
+        else:
+            KEY_NAME = "networks"
+        ##################
+
     plnet.InitInterfaces(logger, plc, data)
-    if 'OVERRIDES' in dir(config): 
+    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)): 
+            if len(bwlimit.tc("class show dev %s" % dev_default)):
                 logger.verbose("net: *** DISABLING NODE BW LIMITS ***")
                 bwlimit.stop()
         else:
@@ -45,16 +63,16 @@ def InitNodeLimit(data):
 
     # query running network interfaces
     devs = sioc.gifconf()
-    ips = dict(zip(devs.values(), devs.keys()))
+    ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
     macs = {}
     for dev in devs:
         macs[sioc.gifhwaddr(dev).lower()] = dev
 
-    for interface in data['interfaces']:
+    for interface in data[KEY_NAME]:
         # Get interface name preferably from MAC address, falling
         # back on IP address.
         hwaddr=interface['mac']
-        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr != None: hwaddr=hwaddr.lower()
         if hwaddr in macs:
             dev = macs[interface['mac']]
         elif interface['ip'] in ips:
@@ -97,7 +115,7 @@ def InitI2(plc, data):
         # 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 = []
@@ -109,20 +127,20 @@ def InitI2(plc, data):
             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()))
+    ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
     macs = {}
     for dev in devs:
         macs[sioc.gifhwaddr(dev).lower()] = dev
 
     ipt = iptables.IPTables()
-    for interface in data['interfaces']:
+    for interface in data[KEY_NAME]:
         # Get interface name preferably from MAC address, falling
         # back on IP address.
         hwaddr=interface['mac']
-        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr != None: hwaddr=hwaddr.lower()
         if hwaddr in macs:
             dev = macs[interface['mac']]
         elif interface['ip'] in ips:
@@ -156,6 +174,3 @@ def InitNAT(plc, data):
                         fields['source'] = "0.0.0.0/0"
                     ipt.add_pf(fields)
     ipt.commit()
-
-def start(options, config):
-    pass