support v1 and v2 return values
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 01:05:05 +0000 (21:05 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 01:05:05 +0000 (21:05 -0400)
sfa/managers/slice_manager.py

index 445dbeb..02729b0 100644 (file)
@@ -370,6 +370,9 @@ class SliceManager:
             if result.get('pl_login'):
                 overall['pl_login'] = result['pl_login']
                 break
+            elif isinstance(result.get('value'), dict) and result['value'].get('pl_login'):
+                overall['pl_login'] = result['value']['pl_login']
+                break
         # append all geni_resources
         overall['geni_resources'] = \
             reduce (lambda x,y: x+y, [ result['geni_resources'] for result in results] , [])