From: Sandrine Avakian <sandrine.avakian@inrialpes.fr>
Date: Mon, 5 Nov 2012 09:55:20 +0000 (+0100)
Subject: Adding new lease format support to special RSpec format slab.
X-Git-Tag: sfa-2.1-24~3^2~41
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1f5d311a6dfda0e608bf5612b4f50ebb3bfba993;p=sfa.git

Adding new lease format support to special RSpec format slab.
---

diff --git a/sfa/rspecs/elements/versions/slabv1Lease.py b/sfa/rspecs/elements/versions/slabv1Lease.py
index 24689c79..787f2ce2 100644
--- a/sfa/rspecs/elements/versions/slabv1Lease.py
+++ b/sfa/rspecs/elements/versions/slabv1Lease.py
@@ -39,15 +39,16 @@ class Slabv1Lease:
 
     @staticmethod
     def get_lease_objs(lease_elems):
-        leases = []    
+        leases = []
         for lease_elem in lease_elems:
-            lease = Lease(lease_elem.attrib, lease_elem)
-            if lease.get('lease_id'):
-               lease['lease_id'] = lease_elem.attrib['lease_id']
-            lease['component_id'] = lease_elem.attrib['component_id']
-            lease['slice_id'] = lease_elem.attrib['slice_id']
-            lease['start_time'] = lease_elem.attrib['start_time']
-            lease['duration'] = lease_elem.attrib['duration']
-
-            leases.append(lease)
-        return leases      
\ No newline at end of file
+            #get nodes
+            node_elems = lease_elem.xpath('./default:node | ./node')
+            for node_elem in node_elems:
+                 lease = Lease(lease_elem.attrib, lease_elem)
+                 lease['slice_id'] = lease_elem.attrib['slice_id']
+                 lease['start_time'] = lease_elem.attrib['start_time']
+                 lease['duration'] = lease_elem.attrib['duration']
+                 lease['component_id'] = node_elem.attrib['component_id']
+                 leases.append(lease)
+
+        return leases