Fixing mistake in db name.

[sfa.git] / sfa / iotlab / iotlabslices.py

diff --git a/sfa/iotlab/iotlabslices.py b/sfa/iotlab/iotlabslices.py
index 0fa6891..1068840 100644 (file)
--- a/sfa/iotlab/iotlabslices.py
+++ b/sfa/iotlab/iotlabslices.py
@@ -108,7 +108,7 @@ class IotlabSlices:
         logger.debug("IOTLABSLICES verify_slice_leases sfa_slice %s "
                      % (sfa_slice))
         #First get the list of current leases from OAR
-        leases = self.driver.iotlab_api.GetLeases({'name': sfa_slice['hrn']})
+        leases = self.driver.iotlab_api.GetLeases({'slice_hrn': sfa_slice['hrn']})
         logger.debug("IOTLABSLICES verify_slice_leases requested_jobs_dict %s \
                         leases %s " % (requested_jobs_dict, leases))
 
@@ -130,6 +130,9 @@ class IotlabSlices:
 
         #First remove job whose duration is too short
         for job in requested_jobs_dict.values():
+            job['duration'] = \
+                str(int(job['duration']) \
+                * self.driver.iotlab_api.GetLeaseGranularity())
             if job['duration'] < self.driver.iotlab_api.GetLeaseGranularity():
                 del requested_jobs_dict[job['start_time']]
 
@@ -386,11 +389,12 @@ class IotlabSlices:
         for info in users:
             if 'slice_record' in info:
                 slice_rec = info['slice_record']
-                user = slice_rec['user']
+                if 'user' in slice_rec :
+                    user = slice_rec['user']
 
-            if 'email' in user:
-                users_by_email[user['email']] = user
-                users_dict[user['email']] = user
+                    if 'email' in user:
+                        users_by_email[user['email']] = user
+                        users_dict[user['email']] = user
 
         logger.debug("SLABSLICE.PY \t verify_person  \
                         users_dict %s \r\n user_by_email %s \r\n \