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
Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
c262906
..
5531554
100755
(executable)
--- a/
nm.py
+++ b/
nm.py
@@
-54,7
+54,7
@@
if os.path.exists(options.path):
modules = []
modules = []
-def GetSlivers(
plc, config
):
+def GetSlivers(
config, plc
):
'''Run call backs defined in modules'''
try:
logger.log("Syncing w/ PLC")
'''Run call backs defined in modules'''
try:
logger.log("Syncing w/ PLC")
@@
-70,7
+70,7
@@
def GetSlivers(plc, config):
for module in modules:
try:
callback = getattr(module, 'GetSlivers')
for module in modules:
try:
callback = getattr(module, 'GetSlivers')
- callback(
plc, data, config
)
+ callback(
data, config, plc
)
except: logger.log_exc()
except: logger.log_exc()
@@
-85,7
+85,11
@@
def getPLCDefaults(data, config):
if len(attr_dict):
logger.verbose("Found default slice overrides.\n %s" % attr_dict)
config.OVERRIDES = attr_dict
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():
def run():
@@
-133,10
+137,22
@@
def run():
irandom=int(options.random)
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
irandom=int(options.random)
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=iperiod/2)
+ #check auth
+ logger.log("Checking Auth.")
+ while plc.check_authentication() != True:
+ try:
+ plc.update_session()
+ logger.log("Authentication Failure. Retrying")
+ except:
+ logger.log("Retry Failed. Waiting")
+ time.sleep(iperiod)
+ logger.log("Authentication Succeeded!")
+
+
while True:
# Main NM Loop
logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
while True:
# Main NM Loop
logger.verbose('mainloop - nm:getSlivers - period=%d random=%d'%(iperiod,irandom))
- GetSlivers(
plc, config
)
+ GetSlivers(
config, plc
)
delay=iperiod + random.randrange(0,irandom)
logger.verbose('mainloop - sleeping for %d s'%delay)
time.sleep(delay)
delay=iperiod + random.randrange(0,irandom)
logger.verbose('mainloop - sleeping for %d s'%delay)
time.sleep(delay)