X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=net.py;h=7756d6bf3aeac18b090240e357aad5cdc9f2cb84;hp=b1f234def4ba5d219ea4c058a7dcaff17346d732;hb=HEAD;hpb=0d641521588473a60d835b8b13a9567f6d49effc

diff --git a/net.py b/net.py
index b1f234d..7756d6b 100644
--- a/net.py
+++ b/net.py
@@ -1,18 +1,21 @@
-"""network configuration"""
+"""
+network configuration
+"""
 
 # system provided modules
-import os, string, time, socket
+import os
 
 # PlanetLab system modules
 import sioc, plnet
 
 # local modules
-try:    import bwlimit as bwlimit
-except: import bwlimitlxc as bwlimit
-import 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()
 
@@ -31,10 +34,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"
@@ -60,7 +63,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
@@ -69,7 +72,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:
@@ -127,7 +130,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
@@ -137,7 +140,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: