Expessing leases timeslot in start_time and duration in number of grain

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index e2ff3f9..d232cc5 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -254,6 +254,7 @@ class PlAggregate:
            filter.update({'name':slice['name']})
         return_fields = ['lease_id', 'hostname', 'site_id', 'name', 't_from', 't_until']
         leases = self.driver.shell.GetLeases(filter)
+        grain = self.driver.shell.GetLeaseGranularity()
 
         site_ids = []
         for lease in leases:
@@ -276,8 +277,8 @@ class PlAggregate:
             slice_hrn = slicename_to_hrn(self.driver.hrn, lease['name'])
             slice_urn = hrn_to_urn(slice_hrn, 'slice')
             rspec_lease['slice_id'] = slice_urn
-            rspec_lease['t_from'] = lease['t_from']
-            rspec_lease['t_until'] = lease['t_until']          
+            rspec_lease['start_time'] = lease['t_from']
+            rspec_lease['duration'] = (lease['t_until'] - lease['t_from']) / grain
             rspec_leases.append(rspec_lease)
         return rspec_leases
 

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 7835a1d..d72f2e6 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -749,8 +749,8 @@ class PlDriver (Driver):
             requested_lease = {}
             if not lease.get('lease_id'):
                requested_lease['hostname'] = xrn_to_hostname(lease.get('component_id').strip())
-               requested_lease['t_from'] = lease.get('t_from')
-               requested_lease['t_until'] = lease.get('t_until')
+               requested_lease['start_time'] = lease.get('start_time')
+               requested_lease['duration'] = lease.get('duration')
             else:
                kept_leases.append(int(lease['lease_id']))
             if requested_lease.get('hostname'):

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 54cfaa1..eb60066 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -162,6 +162,7 @@ class PlSlices:
     def verify_slice_leases(self, slice, requested_leases, kept_leases, peer):
         
         leases = self.driver.shell.GetLeases({'name':slice['name']}, ['lease_id'])
+        grain = self.driver.shell.GetLeaseGranularity()
         current_leases = [lease['lease_id'] for lease in leases]
         deleted_leases = list(set(current_leases).difference(kept_leases))
 
@@ -170,7 +171,7 @@ class PlSlices:
                 self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
             deleted=self.driver.shell.DeleteLeases(deleted_leases)
             for lease in requested_leases:
-                added=self.driver.shell.AddLeases(lease['hostname'], slice['name'], int(lease['t_from']), int(lease['t_until']))
+                added=self.driver.shell.AddLeases(lease['hostname'], slice['name'], int(lease['start_time']), int(lease['duration']) * grain + int(lease['start_time']))
 
         except: 
             logger.log_exc('Failed to add/remove slice leases')

diff --git a/sfa/rspecs/elements/lease.py b/sfa/rspecs/elements/lease.py
index d329a8c..3327407 100644 (file)
--- a/sfa/rspecs/elements/lease.py
+++ b/sfa/rspecs/elements/lease.py
@@ -6,6 +6,6 @@ class Lease(Element):
         'lease_id',
         'component_id',
         'slice_id'
-        't_from',
-        't_until',    
+        'start_time',
+        'duration',    
     ]

diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py
index 7a2320e..8dffdfd 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/sfa/rspecs/elements/versions/sfav1Lease.py
@@ -34,7 +34,7 @@ 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)
 
@@ -54,8 +54,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