X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=23a13b6b30185ad32c5912b00ac58d0ed99c3ffe;hb=ac6786141feadccdc48b819ab21a825a54881ded;hp=cb7850ebbb8485c4cfdb14a2fa0a8a1c0d4662fe;hpb=db4118a58cef01c0ad8ac5c76c752c6051e1575b;p=nodemanager.git diff --git a/net.py b/net.py index cb7850e..23a13b6 100644 --- a/net.py +++ b/net.py @@ -1,6 +1,3 @@ -# $Id$ -# $URL$ - """network configuration""" # system provided modules @@ -10,21 +7,21 @@ import os, string, time, socket 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() -# 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 + # band-aid for short period as old API returns networks instead of interfaces global KEY_NAME KEY_NAME = "interfaces" ################# @@ -33,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"