git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f1ae83
)
cannot assume all SliverStatus results have the pl_login field
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 00:52:54 +0000
(20:52 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 00:52:54 +0000
(20:52 -0400)
sfa/managers/slice_manager.py
patch
|
blob
|
history
diff --git
a/sfa/managers/slice_manager.py
b/sfa/managers/slice_manager.py
index
75dbec4
..
445dbeb
100644
(file)
--- a/
sfa/managers/slice_manager.py
+++ b/
sfa/managers/slice_manager.py
@@
-365,7
+365,11
@@
class SliceManager:
# mmh, it is expected that all results carry the same urn
overall['geni_urn'] = results[0]['geni_urn']
- overall['pl_login'] = results[0]['pl_login']
+ overall['pl_login'] = None
+ for result in results:
+ if result.get('pl_login'):
+ overall['pl_login'] = result['pl_login']
+ break
# append all geni_resources
overall['geni_resources'] = \
reduce (lambda x,y: x+y, [ result['geni_resources'] for result in results] , [])