X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=23a13b6b30185ad32c5912b00ac58d0ed99c3ffe;hb=ac6786141feadccdc48b819ab21a825a54881ded;hp=b1f234def4ba5d219ea4c058a7dcaff17346d732;hpb=0d641521588473a60d835b8b13a9567f6d49effc;p=nodemanager.git diff --git a/net.py b/net.py index b1f234d..23a13b6 100644 --- a/net.py +++ b/net.py @@ -7,8 +7,7 @@ import os, string, time, socket 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 @@ -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 - # 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"