#!/usr/bin/python
-
+#
+# $Id$
+# $URL$
#
# Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
#
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')
try:
logger.log("Syncing w/ PLC")
data = plc.GetSlivers()
- if (options.verbose): logger.log_slivers(data)
+ # 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)
except:
logger.log_exc()
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)
config.OVERRIDES = attr_dict
- elif 'OVERRIDES' in dir(config): del config.OVERRIDES
+ return
+ # NOTE: if an _default slice existed, it would have been found above and
+ # the routine would return. Thus, if we've gotten here, then no default
+ # slice is bound to this node.
+ if 'OVERRIDES' in dir(config): del config.OVERRIDES
def run():