X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=4bd7c71b38538b189b59545c93b1a72779a4ac88;hb=refs%2Fheads%2F1.7;hp=ba48959399ab451c86c5c2158c0cc5e397172b0a;hpb=9ae0bc640aa7bd9f40b4ea755b89c878ce7de8cb;p=nodemanager.git

diff --git a/net.py b/net.py
index ba48959..4bd7c71 100644
--- a/net.py
+++ b/net.py
@@ -14,18 +14,23 @@ import sioc, plnet
 import bwlimit, logger, iptables
 
 def GetSlivers(plc, data, config):
+    logger.verbose("net:GetSlivers called.")
     InitInterfaces(plc, data) # writes sysconfig files.
-    if ('OVERRIDES' in dir(config)) and (config.OVERRIDES.get('net_max_rate') == -1):
-        logger.log("Slice and node BW Limits disabled.")
-        if len(bwlimit.get()): 
-            logger.verbose("*** DISABLING NODE BW LIMITS ***")
-            bwlimit.stop()
+    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")): 
+                logger.verbose("*** DISABLING NODE BW LIMITS ***")
+                bwlimit.stop()
+        else:
+            InitNodeLimit(data)
+            InitI2(plc, data)
     else:
         InitNodeLimit(data)
         InitI2(plc, data)
-        
     InitNAT(plc, data)
 
+
 def InitNodeLimit(data):
     if not 'networks' in data: return