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 'master' into senslab2
[sfa.git]
/
sfa
/
nitos
/
nitosslices.py
diff --git
a/sfa/nitos/nitosslices.py
b/sfa/nitos/nitosslices.py
index
077b0d4
..
2edd209
100644
(file)
--- a/
sfa/nitos/nitosslices.py
+++ b/
sfa/nitos/nitosslices.py
@@
-188,11
+188,11
@@
class NitosSlices:
if not nitos_users:
# create the user
if not nitos_users:
# create the user
- user_id = self.driver.shell.addUser
s
({'username': email.split('@')[0], 'email': email})
+ user_id = self.driver.shell.addUser({'username': email.split('@')[0], 'email': email})
added_users.append(user_id)
# add user keys
for key in user['keys']:
added_users.append(user_id)
# add user keys
for key in user['keys']:
- self.driver.shell.addUserKey({'user_id': user_id, 'key': key})
+ self.driver.shell.addUserKey({'user_id': user_id, 'key': key
, 'slice_id': slice['slice_id']
})
# add the user to the slice
self.driver.shell.addUserToSlice({'slice_id': slice['slice_id'], 'user_id': user_id})
else:
# add the user to the slice
self.driver.shell.addUserToSlice({'slice_id': slice['slice_id'], 'user_id': user_id})
else: