add target tags

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 562a52d..370c8df 100644 (file)
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+# Something relevant
 """Node Manager"""
 
 import optparse
@@ -15,7 +15,8 @@ import tools
 
 from config import Config
 from plcapi import PLCAPI 
-
+import random
+import net
 
 savedargv = sys.argv[:]
 
@@ -24,20 +25,23 @@ parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=
 parser.add_option('-s', '--startup', action='store_true', dest='startup', default=False, help='run all sliver startup scripts')
 parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config', help='PLC configuration file')
 parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)')
-parser.add_option('-p', '--period', action='store', dest='period', default=900, help='Polling interval (sec)')
+parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
 (options, args) = parser.parse_args()
 
 modules = []
 
 def GetSlivers(plc):
-    data = plc.GetSlivers()
-    # net needs access to API for i2 nodes.
+    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:
-        if module.__name__ == 'net':
-            module.GetSlivers(plc, data)
-        else:
+        try:        
             callback = getattr(module, 'GetSlivers')
             callback(data)
+        except: logger.log_exc()
 
 def run():
     try:
@@ -55,7 +59,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)
@@ -73,9 +77,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()