X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_credential.py;h=f788eadc89e093e8245e6a0354c1ad712a807dc4;hb=09089b7cecf89a0fa3f807c466f774683c29f221;hp=c11c5671bd108c8ec60e407617ceb2c2105b7701;hpb=b073401948a91054f0963f9b3ca0fbbb9a5b2ecc;p=sfa.git

diff --git a/sfa/methods/get_credential.py b/sfa/methods/get_credential.py
index c11c5671..f788eadc 100644
--- a/sfa/methods/get_credential.py
+++ b/sfa/methods/get_credential.py
@@ -4,9 +4,11 @@
 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.trust.credential import Credential
 
 class get_credential(Method):
     """
@@ -15,7 +17,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 hrn human readable name of object
+    @param hrn human readable name of object (hrn or urn)
 
     @return the string representation of a credential object  
     """
@@ -25,12 +27,21 @@ class get_credential(Method):
     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")
 
-    def call(self, cred, type, hrn):
+    def call(self, cred, type, xrn, origin_hrn=None):
+        if type:
+            hrn = urn_to_hrn(xrn)[0]
+        else:
+            hrn, type = urn_to_hrn(xrn)
+
+	#log the call
+	if not origin_hrn:
+            origin_hrn = Credential(string=cred).get_gid_caller().get_hrn()
+	self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))	
 
         self.api.auth.check(cred, 'getcredential')
         self.api.auth.verify_object_belongs_to_me(hrn)
@@ -40,4 +51,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])
-        return manager.get_credential(self.api, hrn, type)
+        return manager.get_credential(self.api, xrn, type)