X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FGetSelfCredential.py;h=aa53defb7713d1013df720aa2ed7e95bd706af24;hb=f41d4566c5db5ac9b36a5a86ded828197fe3b1fd;hp=b8eb18a3535612dae2f184458ba08609b82e1c35;hpb=3cf5c9d8e3f11fa56450c22efdbd6e483c5adda9;p=sfa.git diff --git a/sfa/methods/GetSelfCredential.py b/sfa/methods/GetSelfCredential.py index b8eb18a3..aa53defb 100644 --- a/sfa/methods/GetSelfCredential.py +++ b/sfa/methods/GetSelfCredential.py @@ -57,18 +57,17 @@ class GetSelfCredential(Method): ### authenticate the gid # import here so we can load this module at build-time for sfa2wsdl #from sfa.storage.alchemy import dbsession - from sfa.storage.persistentobjs import RegRecord + from sfa.storage.model import RegRecord # xxx-local - the current code runs Resolve, which would forward to # another registry if needed # I wonder if this is truly the intention, or shouldn't we instead # only look in the local db ? - records = self.api.manager.Resolve(self.api, xrn, type) + records = self.api.manager.Resolve(self.api, xrn, type, details=False) if not records: raise RecordNotFound(hrn) - record_obj = RegRecord ('unknown') - record_obj.set_from_dict (records[0]) + record_obj = RegRecord (dict=records[0]) # xxx-local the local-only version would read #record_obj = dbsession.query(RegRecord).filter_by(hrn=hrn).first() #if not record_obj: raise RecordNotFound(hrn) @@ -85,4 +84,4 @@ class GetSelfCredential(Method): self.api.logger.debug("ConnectionKeyGIDMismatch, %s filename: %s"%(name,obj.filename)) raise ConnectionKeyGIDMismatch(gid.get_subject()) - return self.api.manager.GetCredential(self.api, xrn, type, is_self=True) + return self.api.manager.GetCredential(self.api, xrn, type)