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

diff --git a/net.py b/net.py
index b1f234d..884898e 100644
--- a/net.py
+++ b/net.py
@@ -7,8 +7,7 @@ import os, string, time, socket
 import sioc, plnet
 
 # local modules
-try:    import bwlimit as bwlimit
-except: import bwlimitlxc as bwlimit
+import plnode.bwlimit as bwlimit
 import logger, iptables, tools
 
 # we can't do anything without a network
@@ -31,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"
@@ -60,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
@@ -69,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:
@@ -127,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
@@ -137,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: