From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 31 Dec 2009 00:13:26 +0000 (+0000)
Subject: get original caller's hrn from the credential's gid_origin_caller object
X-Git-Tag: sfa-0.9-7~61
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b6f8c8bc125665abeaf605bc16d6c4f47b075327;p=sfa.git

get original caller's hrn from the credential's gid_origin_caller object
---

diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index 5c33129d..2c50e2b7 100644
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -22,18 +22,20 @@ class get_slices(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified")),
-	Parameter(str, "Callers credential string")
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = [Parameter(str, "Human readable slice name (hrn)")]
     
     def call(self, cred, request_hash=None):
+        user_cred = Credential(string=cred)
+        #log the call
+        gid_origin_caller = user_cred.get_gid_origin_caller()
+        origin_hrn = gid_origin_caller.get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn(), None, self.name))
+
         self.api.auth.authenticateCred(cred, [cred], request_hash) 
         self.api.auth.check(cred, 'listslices')
-	
-        #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=cred).get_gid_caller().get_hrn(), None, self.name))
 
         slices = []
         # send the call to the right manager