X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net.py;h=810490c8ce79d4176fab26d03a89d158913c87f7;hb=737532f28237ed08d3895b5912866476f909e04f;hp=9628bc2eee82aefc3deddaf3d8ed8f23ffbcf71e;hpb=fcd53d68ccd5603cd0281b32ca56d41493f56dc9;p=nodemanager.git

diff --git a/net.py b/net.py
index 9628bc2..810490c 100644
--- a/net.py
+++ b/net.py
@@ -3,18 +3,33 @@
 #
 """network configuration"""
 
-import sioc
-import bwlimit
-import logger
-import string
-import iptables
-import os
-
-def GetSlivers(plc, data):
-    InitNodeLimit(data)
-    InitI2(plc, data)
+# system provided modules
+import os, string, time, socket
+
+# PlanetLab system modules
+import sioc, plnet
+
+# local modules
+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):
+        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):
     # query running network interfaces
     devs = sioc.gifconf()
@@ -123,5 +138,10 @@ def InitNAT(plc, data):
                     ipt.add_pf(fields)
     ipt.commit()
 
+def InitInterfaces(plc, data):
+    if not 'networks' in data:
+        return
+    plnet.InitInterfaces(logger, plc, data)
+
 def start(options, config):
     pass