leases.append(reserved_nodes[lease_id])
rspec_leases = self.leases_to_rspec_leases(leases)
- logger.warning("iotlabaggregate list_resources rspec_leases %s" %
- rspec_leases)
rspec.version.add_leases(rspec_leases)
return rspec.toxml()
return geni_slivers
def aggregate_version(self):
- logger.warning("iotlabdriver aggregate_version")
version_manager = VersionManager()
ad_rspec_versions = []
request_rspec_versions = []
leases = rspec.version.get_leases()
start_time = min([int(lease['start_time'])
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])
return {'error': err.reason}
for exp in experiments['items']:
# BUG IN OAR REST API : job with reservation didn't return
- # resources attribute list
- # we use another request for finding job resources
+ # resources attribute list. We use another request for
+ # finding job resources
exp_nodes = self.api.method('admin/experiments/%d' % exp['id'])
exp['resources'] = exp_nodes['nodes']
+ # BUG ASAP jobs without date information
+ if exp['date'] == "as soon as possible":
+ exp['date'] = 0
reserved_nodes_dict[exp['id']] = exp
return reserved_nodes_dict