X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=be4e16e1627ccf585b7974cc1870ed7c863c11be;hb=c67fdcedb4e4351c1b3d3457af27931aefa3cae2;hp=7c9242d05ade01265f4758d6445273297c8d764d;hpb=fbe93c2f926828da8fa6fe491a391b0d98608bc6;p=nodemanager.git diff --git a/net.py b/net.py index 7c9242d..be4e16e 100644 --- a/net.py +++ b/net.py @@ -11,18 +11,20 @@ import os, string, time, socket import sioc, plnet # local modules -import bwlimit, logger, iptables +import bwlimit, logger, iptables, tools + +dev_default = tools.get_default_if() def start(options, conf): logger.log("net plugin starting up...") -def GetSlivers(plc, data, config): +def GetSlivers(data, config, plc): logger.verbose("net:GetSlivers called.") InitInterfaces(plc, data) # writes sysconfig files. if 'OVERRIDES' in dir(config): if config.OVERRIDES.get('net_max_rate') == '-1': logger.log("net: Slice and node BW Limits disabled.") - if len(bwlimit.tc("class show dev eth0")): + if len(bwlimit.tc("class show dev %s" % dev_default)): logger.verbose("*** DISABLING NODE BW LIMITS ***") bwlimit.stop() else: