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
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
sfa
/
iotlab
/
iotlabdriver.py
diff --git
a/sfa/iotlab/iotlabdriver.py
b/sfa/iotlab/iotlabdriver.py
index
f2c9a26
..
efbe4b6
100644
(file)
--- a/
sfa/iotlab/iotlabdriver.py
+++ b/
sfa/iotlab/iotlabdriver.py
@@
-99,9
+99,9
@@
class IotLabDriver(Driver):
'geni_slivers': desc['geni_slivers']}
return status
'geni_slivers': desc['geni_slivers']}
return status
- def _get_users(self):
+ def _get_users(self
, email=None
):
""" Get all users """
""" Get all users """
- ret = self.shell.get_users()
+ ret = self.shell.get_users(
email
)
if 'error' in ret:
return None
return ret
if 'error' in ret:
return None
return ret
@@
-110,10
+110,10
@@
class IotLabDriver(Driver):
""" Get user login with email """
email = caller_user['email']
# ensure user exist in LDAP tree
""" Get user login with email """
email = caller_user['email']
# ensure user exist in LDAP tree
- users = self._get_users()
- if
users and
email not in users:
+ users = self._get_users(
email
)
+ if email not in users:
self.shell.add_user(caller_user)
self.shell.add_user(caller_user)
- users = self._get_users()
+ users = self._get_users(
email
)
if users and email in users:
return users[email]['login']
else:
if users and email in users:
return users[email]['login']
else:
@@
-143,7
+143,7
@@
class IotLabDriver(Driver):
"""
leases = rspec.version.get_leases()
start_time = min([int(lease['start_time'])
"""
leases = rspec.version.get_leases()
start_time = min([int(lease['start_time'])
- for lease in leases])
+
for lease in leases])
# ASAP jobs
if start_time == 0:
start_time = None
# ASAP jobs
if start_time == 0:
start_time = None
@@
-152,13
+152,13
@@
class IotLabDriver(Driver):
# schedule jobs
else:
end_time = max([int(lease['start_time']) +
# schedule jobs
else:
end_time = max([int(lease['start_time']) +
- int(lease['duration'])
*
60
+ int(lease['duration'])
*
60
for lease in leases])
from math import floor
# minutes
for lease in leases])
from math import floor
# minutes
- duration = floor((end_time - start_time)
/
60)
+ duration = floor((end_time - start_time)
/
60)
nodes_list = [Xrn.unescape(Xrn(lease['component_id'].strip(),
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))
for lease in leases]
# uniq hostnames
nodes_list = list(set(nodes_list))