X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=net.py;h=884898e248cf82760e9eddf2fc0de97a8dee45f1;hp=23a13b6b30185ad32c5912b00ac58d0ed99c3ffe;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hpb=7b8fc390afd0349706c45c3ae970770cdf9dceae diff --git a/net.py b/net.py index 23a13b6..884898e 100644 --- a/net.py +++ b/net.py @@ -59,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 @@ -68,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: @@ -126,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 @@ -136,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: