git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ASAP mgt and fix start_time with ASAP jobs
[sfa.git]
/
sfa
/
iotlab
/
iotlabdriver.py
diff --git
a/sfa/iotlab/iotlabdriver.py
b/sfa/iotlab/iotlabdriver.py
index
8a52ee6
..
231ed06
100644
(file)
--- a/
sfa/iotlab/iotlabdriver.py
+++ b/
sfa/iotlab/iotlabdriver.py
@@
-63,7
+63,6
@@
class IotLabDriver(Driver):
return geni_slivers
def aggregate_version(self):
return geni_slivers
def aggregate_version(self):
- logger.warning("iotlabdriver aggregate_version")
version_manager = VersionManager()
ad_rspec_versions = []
request_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []
request_rspec_versions = []
@@
-145,6
+144,9
@@
class IotLabDriver(Driver):
leases = rspec.version.get_leases()
start_time = min([int(lease['start_time'])
for lease in leases])
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])
end_time = max([int(lease['start_time']) +
int(lease['duration'])*60
for lease in leases])