X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=23a13b6b30185ad32c5912b00ac58d0ed99c3ffe;hb=ac6786141feadccdc48b819ab21a825a54881ded;hp=f67ec78db960e70cdc918bc547fbd301ad0f0549;hpb=d56e033f955c4c04980fc8f5a8dfed599afa68ff;p=nodemanager.git diff --git a/net.py b/net.py index f67ec78..23a13b6 100644 --- a/net.py +++ b/net.py @@ -1,6 +1,3 @@ -# $Id$ -# $URL$ - """network configuration""" # system provided modules @@ -10,7 +7,8 @@ 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 @@ -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 - # 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"