From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 22 Jun 2012 01:05:05 +0000 (-0400)
Subject: support v1 and v2 return values
X-Git-Tag: sfa-2.1-12~43
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=048e0c1b8cd5995b11e4f59ebf972cf2d98af46e;p=sfa.git

support v1 and v2 return values
---

diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index 445dbebd..02729b00 100644
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -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] , [])