X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=884898e248cf82760e9eddf2fc0de97a8dee45f1;hb=54c53b53e5deefc2525888212dbed5bb0f8b0a3b;hp=cb7850ebbb8485c4cfdb14a2fa0a8a1c0d4662fe;hpb=db4118a58cef01c0ad8ac5c76c752c6051e1575b;p=nodemanager.git

diff --git a/net.py b/net.py
index cb7850e..884898e 100644
--- a/net.py
+++ b/net.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 """network configuration"""
 
 # system provided modules
@@ -10,21 +7,21 @@ import os, string, time, socket
 import sioc, plnet
 
 # local modules
-import bwlimit, logger, iptables, tools
+import plnode.bwlimit as bwlimit
+import logger, iptables, tools
 
 # we can't do anything without a network
 priority=1
 
 dev_default = tools.get_default_if()
 
-# added by caglar
-# band-aid for short period as old API returns networks instead of interfaces
 
 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"
     #################
@@ -33,10 +30,10 @@ def GetSlivers(data, config, plc):
     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')
+        # logger.log_missing_data('net.GetSlivers', 'interfaces')
         # return
         if not 'networks' in data:
-            logger.log_missing_data('net.GetSlivers','interfaces')
+            logger.log_missing_data('net.GetSlivers', 'interfaces')
             return
         else:
             KEY_NAME = "networks"
@@ -62,7 +59,7 @@ 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
@@ -71,7 +68,7 @@ def InitNodeLimit(data):
         # 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:
@@ -129,7 +126,7 @@ 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
@@ -139,7 +136,7 @@ def InitNAT(plc, data):
         # 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: