Merge branch 'master' into senslab2

[sfa.git] / sfa / rspecs / elements / versions / sfav1Lease.py

diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py
index 7a2320e..f36418d 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/sfa/rspecs/elements/versions/sfav1Lease.py
@@ -22,7 +22,7 @@ class SFAv1Lease:
 
     @staticmethod
     def add_leases(xml, leases):
-        
+        logger.debug("SFAV1LEASE \t add_lease ")
         network_elems = xml.xpath('//network')
         if len(network_elems) > 0:
             network_elem = network_elems[0]
@@ -34,9 +34,10 @@ class SFAv1Lease:
          
         lease_elems = []       
         for lease in leases:
-            lease_fields = ['lease_id', 'component_id', 'slice_id', 't_from', 't_until']
+            lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease, lease_fields)
             lease_elems.append(lease_elem)
+            logger.debug("SFAV1LEASE \t add_lease lease %s" %(lease))
 
 
     @staticmethod
@@ -54,8 +55,8 @@ class SFAv1Lease:
                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['t_from'] = lease_elem.attrib['t_from']
-            lease['t_until'] = lease_elem.attrib['t_until']
+            lease['start_time'] = lease_elem.attrib['start_time']
+            lease['duration'] = lease_elem.attrib['duration']
 
             leases.append(lease)
         return leases