X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FGetCredential.py;h=f7bc721a9c0c9c9605a8cf77fdbfc37596d8fc08;hb=8c36c18576dc540cfc3b43ff4a676a4993f7abca;hp=f5344a27b932b02df1831875414a4d7315379efb;hpb=9ed5b7e791e0672730538a5ddc7bcb0e0de25519;p=sfa.git diff --git a/sfa/methods/GetCredential.py b/sfa/methods/GetCredential.py index f5344a27..f7bc721a 100644 --- a/sfa/methods/GetCredential.py +++ b/sfa/methods/GetCredential.py @@ -5,6 +5,7 @@ from sfa.trust.credential import Credential from sfa.storage.parameter import Parameter, Mixed + class GetCredential(Method): """ Retrive a credential for an object @@ -18,19 +19,19 @@ class GetCredential(Method): """ interfaces = ['registry'] - + accepts = [ Mixed(Parameter(str, "Credential string"), - Parameter(type([str]), "List of credentials")), + Parameter(type([str]), "List of credentials")), Parameter(str, "Human readable name (hrn or urn)"), Mixed(Parameter(str, "Record type"), Parameter(None, "Type not specified")), - ] + ] returns = Parameter(str, "String representation of a credential object") def call(self, creds, xrn, type): - + if type: hrn = urn_to_hrn(xrn)[0] else: @@ -40,9 +41,10 @@ class GetCredential(Method): valid_creds = self.api.auth.checkCredentials(creds, 'getcredential') self.api.auth.verify_object_belongs_to_me(hrn) - #log the call - origin_hrn = Credential(string=valid_creds[0]).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)) - - return self.api.manager.GetCredential(self.api, xrn, self.api.auth.client_gid.get_urn()) + # log the call + origin_hrn = Credential( + string=valid_creds[0]).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)) + return self.api.manager.GetCredential(self.api, xrn, type, self.api.auth.client_gid.get_urn())