X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=8ad5e65b1b8034ee3345bfde4a242d113536f7a5;hb=refs%2Fheads%2F1.5;hp=6e56501e5b8c3dcfcacdbae881ddb138f4a6cedb;hpb=a474ff48b0b550c033464f3a063fc5d162bca13e;p=nodemanager.git

diff --git a/nm.py b/nm.py
index 6e56501..8ad5e65 100644
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+# $Id: nm.py,v 1.15.2.8 2007/09/04 20:50:30 faiyaza Exp $
+
 """Node Manager"""
 
 import optparse
@@ -14,8 +16,9 @@ import logger
 import tools
 
 from config import Config
-from plcapi import PLCAPI
-
+from plcapi import PLCAPI 
+import random
+import net
 
 savedargv = sys.argv[:]
 
@@ -30,10 +33,17 @@ parser.add_option('-p', '--period', action='store', dest='period', default=600,
 modules = []
 
 def GetSlivers(plc):
-    data = plc.GetSlivers()
+    try: data = plc.GetSlivers()
+    except: logger.log_exc()
+    # Set i2 ip list for nodes in I2 nodegroup.
+    try: net.GetSlivers(plc, data)
+    except: logger.log_exc()
+    #  All other callback modules
     for module in modules:
-        callback = getattr(module, 'GetSlivers')
-        callback(data)
+        try:        
+            callback = getattr(module, 'GetSlivers')
+            callback(data)
+        except: logger.log_exc()
 
 def run():
     try:
@@ -51,7 +61,7 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['net', 'proper', 'conf_files', 'sm']:
+        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
             try:
                 m = __import__(module)
                 m.start(options, config)
@@ -69,9 +79,9 @@ def run():
         plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
 
         while True:
-            try: GetSlivers(plc)
-            except: logger.log_exc()
-            time.sleep(options.period)
+        # Main NM Loop
+            GetSlivers(plc)
+            time.sleep(options.period + random.randrange(0,301))
     except: logger.log_exc()