Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel

[nodemanager.git] / nodemanager.py

diff --git a/nodemanager.py b/nodemanager.py
index 09bb3bb..68a8be4 100755 (executable)
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-#
 # Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
 #
 
@@ -95,8 +92,6 @@ class NodeManager:
             self.getPLCDefaults(data, config)
             # tweak the 'vref' attribute from GetSliceFamily
             self.setSliversVref (data)
-            # check leases and adjust the 'alive' field in slivers
-            self.adjustReservedSlivers (data)
             # dump it too, so it can be retrieved later in case of comm. failure
             self.dumpSlivers(data)
             # log it for debug purposes, no matter what verbose is
@@ -110,8 +105,6 @@ class NodeManager:
             data = {}
             # for modules that request it though the 'persistent_data' property
             last_data=self.loadSlivers()
-            # adjust again with current time
-            self.adjustReservedSlivers (data)
         #  Invoke GetSlivers() functions from the callback modules
         for module in self.loaded_modules:
             logger.verbose('nodemanager: triggering %s.GetSlivers'%module.__name__)
@@ -160,13 +153,6 @@ class NodeManager:
             except:
                 logger.log_exc("nodemanager: Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
 
-    def adjustReservedSlivers (self, data):
-        """
-        On reservable nodes, tweak the 'alive' field to instruct cyclic loop
-        about what to do with slivers.
-        """
-        pass
-
     def dumpSlivers (self, slivers):
         f = open(NodeManager.DB_FILE, "w")
         logger.log ("nodemanager: saving successfully fetched GetSlivers in %s" % NodeManager.DB_FILE)
@@ -210,7 +196,7 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                 try:
                     m = __import__(module)
                     logger.verbose("nodemanager: triggering %s.start"%m.__name__)
-                    m.start(self.options, config)
+                    m.start()
                     self.loaded_modules.append(m)
                 except ImportError, err:
                     print "Warning while loading module %s:" % module, err