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 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
[sfa.git]
/
sfa
/
iotlab
/
iotlabslices.py
diff --git
a/sfa/iotlab/iotlabslices.py
b/sfa/iotlab/iotlabslices.py
index
80b4f47
..
966a26b
100644
(file)
--- a/
sfa/iotlab/iotlabslices.py
+++ b/
sfa/iotlab/iotlabslices.py
@@
-336,8
+336,8
@@
class IotlabSlices:
'authority': slice_record['authority'],
'gid': slice_record['gid'],
'slice_id': slice_record['record_id'],
'authority': slice_record['authority'],
'gid': slice_record['gid'],
'slice_id': slice_record['record_id'],
- 'reg-researchers': slice_record['reg-researchers'],
- 'peer_authority': str(sfa_peer)
+
#
'reg-researchers': slice_record['reg-researchers'],
+
#
'peer_authority': str(sfa_peer)
}
if ldap_user:
}
if ldap_user:
@@
-356,7
+356,7
@@
class IotlabSlices:
return sfa_slice
return sfa_slice
- def verify_persons(self, slice_hrn, slice_record, users, options=
{}
):
+ def verify_persons(self, slice_hrn, slice_record, users, options=
None
):
"""Ensures the users in users list exist and are enabled in LDAP. Adds
person if needed (AddPerson).
"""Ensures the users in users list exist and are enabled in LDAP. Adds
person if needed (AddPerson).
@@
-382,7
+382,7
@@
class IotlabSlices:
"""
"""
-
+ if options is None: options={}
logger.debug("IOTLABSLICES \tverify_persons \tslice_hrn %s \
\t slice_record %s\r\n users %s \t "
% (slice_hrn, slice_record, users))
logger.debug("IOTLABSLICES \tverify_persons \tslice_hrn %s \
\t slice_record %s\r\n users %s \t "
% (slice_hrn, slice_record, users))
@@
-528,10
+528,11
@@
class IotlabSlices:
return added_persons
return added_persons
- def verify_keys(self, persons, users, peer, options=
{}
):
+ def verify_keys(self, persons, users, peer, options=
None
):
"""
.. warning:: unused
"""
"""
.. warning:: unused
"""
+ if options is None: options={}
# existing keys
key_ids = []
for person in persons:
# existing keys
key_ids = []
for person in persons: