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
added support for urn name format. urn is the default name format used over the wire
[sfa.git]
/
sfa
/
methods
/
get_credential.py
diff --git
a/sfa/methods/get_credential.py
b/sfa/methods/get_credential.py
index
c11c567
..
fd3e7bb
100644
(file)
--- a/
sfa/methods/get_credential.py
+++ b/
sfa/methods/get_credential.py
@@
-4,6
+4,7
@@
from sfa.trust.credential import *
from sfa.trust.rights import *
from sfa.util.faults import *
from sfa.trust.credential import *
from sfa.trust.rights import *
from sfa.util.faults import *
+from sfa.util.namespace import *
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.util.debug import log
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.util.debug import log
@@
-15,7
+16,7
@@
class get_credential(Method):
@param cred credential object specifying rights of the caller
@param type type of object (user | slice | sa | ma | node)
@param cred credential object specifying rights of the caller
@param type type of object (user | slice | sa | ma | node)
- @param hrn human readable name of object
+ @param hrn human readable name of object
(hrn or urn)
@return the string representation of a credential object
"""
@return the string representation of a credential object
"""
@@
-25,12
+26,16
@@
class get_credential(Method):
accepts = [
Mixed(Parameter(str, "credential"),
Parameter(None, "No credential")),
accepts = [
Mixed(Parameter(str, "credential"),
Parameter(None, "No credential")),
- Parameter(str, "Human readable name (hrn)")
+ Parameter(str, "Human readable name (hrn
or urn
)")
]
returns = Parameter(str, "String representation of a credential object")
]
returns = Parameter(str, "String representation of a credential object")
- def call(self, cred, type, hrn):
+ def call(self, cred, type, xrn):
+ if type:
+ hrn = urn_to_hrn(xrn)[0]
+ else:
+ hrn, type = urn_to_hrn(xrn)
self.api.auth.check(cred, 'getcredential')
self.api.auth.verify_object_belongs_to_me(hrn)
self.api.auth.check(cred, 'getcredential')
self.api.auth.verify_object_belongs_to_me(hrn)
@@
-40,4
+45,4
@@
class get_credential(Method):
mgr_type = self.api.config.SFA_REGISTRY_TYPE
manager_module = manager_base + ".registry_manager_%s" % mgr_type
manager = __import__(manager_module, fromlist=[manager_base])
mgr_type = self.api.config.SFA_REGISTRY_TYPE
manager_module = manager_base + ".registry_manager_%s" % mgr_type
manager = __import__(manager_module, fromlist=[manager_base])
- return manager.get_credential(self.api,
h
rn, type)
+ return manager.get_credential(self.api,
x
rn, type)