git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expects the 'interfaces' key in GetSlivers - review logs to always mention module
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
4a561da
..
abc05bb
100755
(executable)
--- a/
nm.py
+++ b/
nm.py
@@
-64,7
+64,7
@@
modules = []
def GetSlivers(config, plc):
'''Run call backs defined in modules'''
try:
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
# retrieve GetSlivers from PLC
data = plc.GetSlivers()
# use the magic 'default' slice to retrieve system-wide defaults
@@
-75,9
+75,9
@@
def GetSlivers(config, plc):
# used to be done only in verbose; very helpful though, and tedious to obtain,
# so let's dump this unconditionnally
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)
- logger.verbose("
Sync w/ PLC done (3)
")
+ logger.verbose("
nm: Sync w/ PLC done
")
except:
except:
- logger.log_exc("
failed in nm.
GetSlivers")
+ 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 = {}
# XXX So some modules can at least boostrap.
logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.")
data = {}
@@
-86,7
+86,7
@@
def GetSlivers(config, plc):
try:
callback = getattr(module, 'GetSlivers')
callback(data, config, plc)
try:
callback = getattr(module, 'GetSlivers')
callback(data, config, plc)
- except: logger.log_exc("nm
.
GetSlivers failed to run callback for module %r"%module)
+ except: logger.log_exc("nm
:
GetSlivers failed to run callback for module %r"%module)
def getPLCDefaults(data, config):
def getPLCDefaults(data, config):
@@
-98,7
+98,7
@@
def getPLCDefaults(data, config):
attr_dict = {}
for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value']
if len(attr_dict):
attr_dict = {}
for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value']
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
config.OVERRIDES = attr_dict
return
# NOTE: if an _default slice existed, it would have been found above and
@@
-122,7
+122,7
@@
def setSliversVref (data):
continue
sliver['attributes'].append({ 'tagname':'vref','value':slicefamily})
except:
continue
sliver['attributes'].append({ 'tagname':'vref','value':slicefamily})
except:
- logger.log_exc("Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
+ logger.log_exc("
nm:
Could not overwrite 'vref' attribute from 'GetSliceFamily'",name=sliver['name'])
def run():
def run():
@@
-148,7
+148,7
@@
def run():
if options.module:
assert options.module in known_modules
running_modules=[options.module]
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:
else:
running_modules=known_modules
for module in running_modules:
@@
-171,25
+171,25
@@
def run():
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
#check auth
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()
while plc.check_authentication() != True:
try:
plc.update_session()
- logger.log("Authentication Failure. Retrying")
+ logger.log("
nm:
Authentication Failure. Retrying")
except:
except:
- logger.log("Retry Failed. Waiting")
+ logger.log("
nm:
Retry Failed. Waiting")
time.sleep(iperiod)
time.sleep(iperiod)
- logger.log("Authentication Succeeded!")
+ logger.log("
nm:
Authentication Succeeded!")
while True:
# Main NM Loop
while True:
# Main NM Loop
- logger.verbose('
mainloop - nm:g
etSlivers - period=%d random=%d'%(iperiod,irandom))
+ logger.verbose('
nm: mainloop - calling G
etSlivers - period=%d random=%d'%(iperiod,irandom))
GetSlivers(config, plc)
delay=iperiod + random.randrange(0,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)
time.sleep(delay)
- except: logger.log_exc("
failed in nm.
run")
+ except: logger.log_exc("
nm: failed in
run")
if __name__ == '__main__':
if __name__ == '__main__':