(*) basically no operational change

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index 482f610..3eaec87 100644 (file)
--- a/nm.py
+++ b/nm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+# Something relevant
 """Node Manager"""
 
 import optparse
@@ -16,6 +16,7 @@ import tools
 from config import Config
 from plcapi import PLCAPI 
 import random
+import net
 
 savedargv = sys.argv[:]
 
@@ -25,30 +26,35 @@ parser.add_option('-s', '--startup', action='store_true', dest='startup', defaul
 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=600, help='Polling interval (sec)')
+parser.add_option('-r', '--random', action='store', dest='random', default=301, help='Range for additional random polling interval (sec)')
+parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log')
 (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()
+    if (options.verbose):
+        logger.log_slivers(data)
+    # 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)
-
-def UpdateHostKey(plc):
-    logger.log('Trying to update ssh host key at PLC...')
-    ssh_host_key = open('/etc/ssh/ssh_host_rsa_key.pub').read().strip()
-    plc.BootUpdateNode(dict(ssh_host_key=ssh_host_key))
-    logger.log('Host key update succeeded')
+        except: logger.log_exc()
 
 def run():
     try:
         if options.daemon: tools.daemon()
 
+        # set log level
+        if (options.verbose):
+            logger.set_level(logger.LOG_VERBOSE)
+
         # Load /etc/planetlab/plc_config
         config = Config(options.config)
 
@@ -61,7 +67,7 @@ def run():
             print "Warning while writing PID file:", err
 
         # Load and start modules
-        for module in ['net', 'proper', 'conf_files', 'sm', 'bwmon']:
+        for module in ['proper', 'conf_files', 'sm', 'bwmon']:
             try:
                 m = __import__(module)
                 m.start(options, config)
@@ -76,18 +82,22 @@ def run():
             session = options.session
 
         # Initialize XML-RPC client
-        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
+        iperiod=int(options.period)
+        irandom=int(options.random)
+        plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
 
         while True:
-            try: UpdateHostKey(plc)
-            except: logger.log_exc()
-            try: GetSlivers(plc)
-            except: logger.log_exc()
-            time.sleep(options.period + random.randrange(0,301))
+        # Main NM Loop
+            logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
+            GetSlivers(plc)
+            delay=iperiod + random.randrange(0,irandom)
+            logger.verbose('mainloop - sleeping for %d s'%delay)
+            time.sleep(delay)
     except: logger.log_exc()
 
 
 if __name__ == '__main__':
+    logger.verbose("Entering nm.py")
     stacklim = 512*1024  # 0.5 MiB
     curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
     if curlim > stacklim: