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 changes from trunk. Check auth and recompute session key when out of synch...
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
e9ca6d6
..
2c05d20
100755
(executable)
--- a/
nm.py
+++ b/
nm.py
@@
-55,8
+55,8
@@
def GetSlivers(plc, config):
try:
logger.log("Syncing w/ PLC")
data = plc.GetSlivers()
try:
logger.log("Syncing w/ PLC")
data = plc.GetSlivers()
- getPLCDefaults(data, config)
if (options.verbose): logger.log_slivers(data)
if (options.verbose): logger.log_slivers(data)
+ getPLCDefaults(data, config)
except:
logger.log_exc()
# XXX So some modules can at least boostrap.
except:
logger.log_exc()
# XXX So some modules can at least boostrap.
@@
-81,7
+81,7
@@
def getPLCDefaults(data, config):
for slice in data.get('slivers'):
if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
attr_dict = {}
for slice in data.get('slivers'):
if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
attr_dict = {}
- for attr in slice.get('attributes'): attr_dict[attr['name']] = attr['value']
+ for attr in slice.get('attributes'): attr_dict[attr['
tag
name']] = attr['value']
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
@@
-127,7
+127,7
@@
def run():
if os.path.exists(options.session):
session = file(options.session).read().strip()
else:
if os.path.exists(options.session):
session = file(options.session).read().strip()
else:
- session =
options.session
+ session =
None
# Initialize XML-RPC client
iperiod=int(options.period)
# Initialize XML-RPC client
iperiod=int(options.period)