git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9410669
)
iotlab driver: Applying Jordan's changes in iotlabslices.py
author
Loic Baron
<sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 14:01:24 +0000
(16:01 +0200)
committer
Loic Baron
<sandrine.avakian@inria.fr>
Wed, 30 Jul 2014 14:01:24 +0000
(16:01 +0200)
sfa/iotlab/iotlabslices.py
patch
|
blob
|
history
diff --git
a/sfa/iotlab/iotlabslices.py
b/sfa/iotlab/iotlabslices.py
index
2a1b3bc
..
bf198f6
100644
(file)
--- a/
sfa/iotlab/iotlabslices.py
+++ b/
sfa/iotlab/iotlabslices.py
@@
-165,6
+165,7
@@
class IotlabSlices:
"%( start_time))
if start_time in current_nodes_reserved_by_start_time:
"%( start_time))
if start_time in current_nodes_reserved_by_start_time:
+ # JORDAN : if we request the same nodes: do nothing
if requested_nodes_by_start_time[start_time] == \
current_nodes_reserved_by_start_time[start_time]:
continue
if requested_nodes_by_start_time[start_time] == \
current_nodes_reserved_by_start_time[start_time]:
continue
@@
-312,12
+313,12
@@
class IotlabSlices:
"""
slicename = slice_hrn
"""
slicename = slice_hrn
+ sfa_slice = None
+
# check if slice belongs to Iotlab
slices_list = self.driver.GetSlices(slice_filter=slicename,
slice_filter_type='slice_hrn')
# check if slice belongs to Iotlab
slices_list = self.driver.GetSlices(slice_filter=slicename,
slice_filter_type='slice_hrn')
- sfa_slice = None
-
if slices_list:
for sl in slices_list:
if slices_list:
for sl in slices_list:
@@
-431,6
+432,7
@@
class IotlabSlices:
#Needed because what if the user has been deleted in LDAP but
#is still in SFA?
# GetPersons -> LdapFindUser -> _process_ldap_info_for_one_user
#Needed because what if the user has been deleted in LDAP but
#is still in SFA?
# GetPersons -> LdapFindUser -> _process_ldap_info_for_one_user
+ # XXX LOIC Fix in _process_ldap_info_for_one_user not to update user with hrn=None
existing_users = self.driver.testbed_shell.GetPersons(filter_user)
logger.debug(" \r\n IOTLABSLICES.PY \tverify_person filter_user %s\
existing_users %s "
existing_users = self.driver.testbed_shell.GetPersons(filter_user)
logger.debug(" \r\n IOTLABSLICES.PY \tverify_person filter_user %s\
existing_users %s "
@@
-494,6
+496,7
@@
class IotlabSlices:
#self.verify_keys(existing_slice_users, updated_users_list, \
#peer, append)
#self.verify_keys(existing_slice_users, updated_users_list, \
#peer, append)
+ # XXX JORDAN the uid of the user is put in slice_record['login']
added_persons = []
# add new users
#requested_user_email is in existing_user_emails
added_persons = []
# add new users
#requested_user_email is in existing_user_emails
@@
-501,7
+504,9
@@
class IotlabSlices:
slice_record['login'] = users_dict[requested_user_emails[0]]['uid']
logger.debug(" IOTLABSLICES \tverify_person QUICK DIRTY %s"
% (slice_record))
slice_record['login'] = users_dict[requested_user_emails[0]]['uid']
logger.debug(" IOTLABSLICES \tverify_person QUICK DIRTY %s"
% (slice_record))
+ # XXX JORDAN uid == 'register'
+ # XXX JORDAN i have no added_user_emails
for added_user_email in added_user_emails:
added_user = users_dict[added_user_email]
logger.debug(" IOTLABSLICES \r\n \r\n \t verify_person \
for added_user_email in added_user_emails:
added_user = users_dict[added_user_email]
logger.debug(" IOTLABSLICES \r\n \r\n \t verify_person \