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
etc/slicename and home directory creation
[nodemanager.git]
/
net.py
diff --git
a/net.py
b/net.py
index
cb7850e
..
b962864
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,21
+7,21
@@
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
dev_default = tools.get_default_if()
# we can't do anything without a network
priority=1
dev_default = tools.get_default_if()
-# added by caglar
-# band-aid for short period as old API returns networks instead of interfaces
def start():
logger.log("net: plugin starting up...")
def GetSlivers(data, config, plc):
# added by caglar
def start():
logger.log("net: plugin starting up...")
def GetSlivers(data, config, plc):
# added by caglar
+ # band-aid for short period as old API returns networks instead of interfaces
global KEY_NAME
KEY_NAME = "interfaces"
#################
global KEY_NAME
KEY_NAME = "interfaces"
#################