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 Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
server
/
sfaapi.py
diff --git
a/sfa/server/sfaapi.py
b/sfa/server/sfaapi.py
index
ae54741
..
898fb66
100644
(file)
--- a/
sfa/server/sfaapi.py
+++ b/
sfa/server/sfaapi.py
@@
-128,7
+128,7
@@
class SfaApi (XmlrpcApi):
delegated_cred = None
for cred in creds:
delegated_cred = None
for cred in creds:
- if hierarchy.auth_exists(Credential(
string
=cred).get_gid_caller().get_hrn()):
+ if hierarchy.auth_exists(Credential(
cred
=cred).get_gid_caller().get_hrn()):
delegated_cred = cred
break
return delegated_cred
delegated_cred = cred
break
return delegated_cred
@@
-211,7
+211,6
@@
class SfaApi (XmlrpcApi):
code = {
'geni_code': GENICODE.SUCCESS,
'am_type': 'sfa',
code = {
'geni_code': GENICODE.SUCCESS,
'am_type': 'sfa',
- 'am_code': None,
}
if isinstance(result, SfaFault):
code['geni_code'] = result.faultCode
}
if isinstance(result, SfaFault):
code['geni_code'] = result.faultCode