From ba39ba406a20ca957718fd8f539e782f88068c09 Mon Sep 17 00:00:00 2001 From: Anil-Kumar Vengalil Date: Wed, 9 Dec 2009 15:16:44 +0000 Subject: [PATCH] we were passing the original caller credential accross aggregates for call tracability. Now, it is replaced with the hrn of the actual caller extracted from the credential --- sfa/methods/list.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sfa/methods/list.py b/sfa/methods/list.py index 4bd34965..90a7b8b6 100644 --- a/sfa/methods/list.py +++ b/sfa/methods/list.py @@ -30,14 +30,14 @@ class list(Method): returns = [GeniRecord] - def call(self, cred, hrn, request_hash=None, caller_cred=None): + def call(self, cred, hrn, request_hash=None, origin_hrn=None): self.api.auth.authenticateCred(cred, [cred, hrn], request_hash) self.api.auth.check(cred, 'list') - if caller_cred==None: - caller_cred=cred + if origin_hrn==None: + origin_hrn=Credential(string=cred).get_gid_caller().get_hrn() #log the call - self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name)) + self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) records = [] # load all know registry names into a prefix tree and attempt to find @@ -63,7 +63,7 @@ class list(Method): except: arg_list = [credential, hrn] request_hash = self.api.key.compute_hash(arg_list) - record_list = registries[registry_hrn].list(credential, hrn, request_hash, caller_cred) + record_list = registries[registry_hrn].list(credential, hrn, request_hash, origin_hrn) records = [GeniRecord(dict=record).as_dict() for record in record_list] if records: -- 2.43.0