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
spaces after comma
[nodemanager.git]
/
net.py
diff --git
a/net.py
b/net.py
index
f67ec78
..
23a13b6
100644
(file)
--- a/
net.py
+++ b/
net.py
@@
-1,6
+1,3
@@
-# $Id$
-# $URL$
-
"""network configuration"""
# system provided modules
"""network configuration"""
# system provided modules
@@
-10,7
+7,8
@@
import os, string, time, socket
import sioc, plnet
# local modules
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
# we can't do anything without a network
priority=1
@@
-32,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"