X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=abc05bbff85ef7a556ef935274596a8bc533fb2d;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=b12f0b6f0b1dce73f0af974a908780080f45b054;hpb=bde303ed29410bedf35c719fc596e6bcb6f4afb6;p=nodemanager.git diff --git a/nm.py b/nm.py index b12f0b6..abc05bb 100755 --- a/nm.py +++ b/nm.py @@ -1,5 +1,7 @@ #!/usr/bin/python - +# +# $Id$ +# $URL$ # # Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager # @@ -33,13 +35,18 @@ known_modules=['net','conf_files', 'sm', 'bwmon'] plugin_path = "/usr/share/NodeManager/plugins" +default_period=600 +default_random=301 + parser = optparse.OptionParser() parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized') 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=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('-p', '--period', action='store', dest='period', default=default_period, + help='Polling interval (sec) - default %d'%default_period) +parser.add_option('-r', '--random', action='store', dest='random', default=default_random, + help='Range for additional random polling interval (sec) -- default %d'%default_random) parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log') parser.add_option('-P', '--path', action='store', dest='path', default=plugin_path, help='Path to plugins directory') @@ -57,14 +64,20 @@ modules = [] def GetSlivers(config, plc): '''Run call backs defined in modules''' try: - logger.log("Syncing w/ PLC") + logger.log("nm: Syncing w/ PLC") + # retrieve GetSlivers from PLC data = plc.GetSlivers() + # use the magic 'default' slice to retrieve system-wide defaults + getPLCDefaults(data, config) + # tweak the 'vref' attribute from GetSliceFamily + setSliversVref (data) + # always dump it for debug purposes # used to be done only in verbose; very helpful though, and tedious to obtain, # so let's dump this unconditionnally logger.log_slivers(data) - getPLCDefaults(data, config) + logger.verbose("nm: Sync w/ PLC done") except: - logger.log_exc() + logger.log_exc("nm: failed in GetSlivers") # XXX So some modules can at least boostrap. logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.") data = {} @@ -73,7 +86,7 @@ def GetSlivers(config, plc): try: callback = getattr(module, 'GetSlivers') callback(data, config, plc) - except: logger.log_exc() + except: logger.log_exc("nm: GetSlivers failed to run callback for module %r"%module) def getPLCDefaults(data, config): @@ -84,14 +97,8 @@ def getPLCDefaults(data, config): if slice['name'] == config.PLC_SLICE_PREFIX+"_default": attr_dict = {} for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value'] - # GetSlivers exposes the result of GetSliceFamily() as an separate key in data - # It is safe to override the attributes with this, as this method has the right logic - try: - attr_dict['vref']=slice.get('GetSliceFamily') - except: - pass if len(attr_dict): - logger.verbose("Found default slice overrides.\n %s" % attr_dict) + logger.verbose("nm: Found default slice overrides.\n %s" % attr_dict) config.OVERRIDES = attr_dict return # NOTE: if an _default slice existed, it would have been found above and @@ -100,6 +107,24 @@ def getPLCDefaults(data, config): if 'OVERRIDES' in dir(config): del config.OVERRIDES +def setSliversVref (data): + ''' + Tweak the 'vref' attribute in all slivers based on the 'GetSliceFamily' key + ''' + # GetSlivers exposes the result of GetSliceFamily() as an separate key in data + # It is safe to override the attributes with this, as this method has the right logic + for sliver in data.get('slivers'): + try: + slicefamily=sliver.get('GetSliceFamily') + for att in sliver['attributes']: + if att['tagname']=='vref': + att['value']=slicefamily + continue + sliver['attributes'].append({ 'tagname':'vref','value':slicefamily}) + except: + logger.log_exc("nm: Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name']) + + def run(): try: if options.daemon: tools.daemon() @@ -123,7 +148,7 @@ def run(): if options.module: assert options.module in known_modules running_modules=[options.module] - logger.verbose('Running single module %s'%options.module) + logger.verbose('nm: Running single module %s'%options.module) else: running_modules=known_modules for module in running_modules: @@ -146,29 +171,29 @@ def run(): plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2) #check auth - logger.log("Checking Auth.") + logger.log("nm: Checking Auth.") while plc.check_authentication() != True: try: plc.update_session() - logger.log("Authentication Failure. Retrying") + logger.log("nm: Authentication Failure. Retrying") except: - logger.log("Retry Failed. Waiting") + logger.log("nm: Retry Failed. Waiting") time.sleep(iperiod) - logger.log("Authentication Succeeded!") + logger.log("nm: Authentication Succeeded!") while True: # Main NM Loop - logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom)) + logger.verbose('nm: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom)) GetSlivers(config, plc) delay=iperiod + random.randrange(0,irandom) - logger.verbose('mainloop - sleeping for %d s'%delay) + logger.verbose('nm: mainloop - sleeping for %d s'%delay) time.sleep(delay) - except: logger.log_exc() + except: logger.log_exc("nm: failed in run") if __name__ == '__main__': - logger.log("Entering nm.py "+id) + logger.log("======================================== Entering nm.py "+id) run() else: # This is for debugging purposes. Open a copy of Python and import nm