X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fiotlab%2Fiotlabdriver.py;h=fc7c7c2752c3d1193d64d22c53b47a7d537e80cc;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=231ed06ac4a1f1bbe06d0820d3e3caf3783866be;hpb=f1919c3c6a9dafb73722538f566c724b7ecfb09b;p=sfa.git diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py index 231ed06a..fc7c7c27 100644 --- a/sfa/iotlab/iotlabdriver.py +++ b/sfa/iotlab/iotlabdriver.py @@ -143,21 +143,25 @@ class IotLabDriver(Driver): """ leases = rspec.version.get_leases() start_time = min([int(lease['start_time']) - for lease in leases]) - # ASAP Jobs + for lease in leases]) + # ASAP jobs if start_time == 0: start_time = None - end_time = max([int(lease['start_time']) + - int(lease['duration'])*60 - for lease in leases]) + duration = max([int(lease['duration']) + for lease in leases]) + # schedule jobs + else: + end_time = max([int(lease['start_time']) + + int(lease['duration']) * 60 + for lease in leases]) + from math import floor + # minutes + duration = floor((end_time - start_time) / 60) nodes_list = [Xrn.unescape(Xrn(lease['component_id'].strip(), - type='node').get_leaf()) + type='node').get_leaf()) for lease in leases] # uniq hostnames nodes_list = list(set(nodes_list)) - from math import floor - # minutes - duration = floor((end_time - start_time)/60) return nodes_list, start_time, duration def _save_db_lease(self, job_id, slice_hrn):