fix merge between onelab and princeton repositories

[nodemanager.git] / net.py

diff --git a/net.py b/net.py
index 45dee4b..de3360b 100644 (file)
--- a/net.py
+++ b/net.py
@@ -12,21 +12,24 @@ import sioc, plnet
 # local modules
 import bwlimit, logger, iptables, tools
 
+# we can't do anything without a network
+priority=1
+
 dev_default = tools.get_default_if()
 
-def start(options, conf):
+def start():
     logger.log("net: plugin starting up...")
 
 def GetSlivers(data, config, plc):
     logger.verbose("net: GetSlivers called.")
-    if not 'interfaces' in data: 
+    if not 'interfaces' in data:
         logger.log_missing_data('net.GetSlivers','interfaces')
         return
     plnet.InitInterfaces(logger, plc, data)
-    if 'OVERRIDES' in dir(config): 
+    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 %s" % dev_default)): 
+            if len(bwlimit.tc("class show dev %s" % dev_default)):
                 logger.verbose("net: *** DISABLING NODE BW LIMITS ***")
                 bwlimit.stop()
         else:
@@ -94,7 +97,7 @@ def InitI2(plc, data):
         # and add IPs that don't exist in the set rather than
         # just recreateing the set.
         bwlimit.exempt_init('Internet2', i2nodes)
-        
+
         # set the iptables classification rule if it doesnt exist.
         cmd = '-A POSTROUTING -m set --set Internet2 dst -j CLASSIFY --set-class 0001:2000 --add-mark'
         rules = []
@@ -106,7 +109,7 @@ def InitI2(plc, data):
             os.popen("/sbin/iptables -t mangle " + cmd)
 
 def InitNAT(plc, data):
-    
+
     # query running network interfaces
     devs = sioc.gifconf()
     ips = dict(zip(devs.values(), devs.keys()))
@@ -153,6 +156,3 @@ def InitNAT(plc, data):
                         fields['source'] = "0.0.0.0/0"
                     ipt.add_pf(fields)
     ipt.commit()
-
-def start(options, config):
-    pass