git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
miscell harmless cleanup in makefile and setup
[nodemanager.git]
/
net.py
diff --git
a/net.py
b/net.py
index
b1f234d
..
884898e
100644
(file)
--- a/
net.py
+++ b/
net.py
@@
-7,8
+7,7
@@
import os, string, time, socket
import sioc, plnet
# local modules
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
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
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:
# 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"
return
else:
KEY_NAME = "networks"
@@
-60,7
+59,7
@@
def InitNodeLimit(data):
# query running network interfaces
devs = sioc.gifconf()
# 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
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']
# 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:
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()
# 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
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']
# 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:
if hwaddr in macs:
dev = macs[interface['mac']]
elif interface['ip'] in ips: