From: Anil-Kumar Vengalil Date: Mon, 14 Dec 2009 18:20:05 +0000 (+0000) Subject: again getting away with caller_Cred and passing just the hrn of the initial caller X-Git-Tag: sfa-0.9-7~144 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=cb510d821a2d18c7f1b4a6f19e9b2fef10696f22 again getting away with caller_Cred and passing just the hrn of the initial caller --- diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py index a3ae45fa..d9bcfa6c 100644 --- a/sfa/methods/delete_slice.py +++ b/sfa/methods/delete_slice.py @@ -28,12 +28,12 @@ class delete_slice(Method): returns = Parameter(int, "1 if successful") - def call(self, cred, hrn, request_hash=None, caller_cred=None): + def call(self, cred, hrn, request_hash=None, origin_hrn=None): - if caller_cred==None: - caller_cred=cred + if origin_hrn==None: + origin_hrn=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)) # This cred will be an slice cred, not a user, so we cant use it to # authenticate the caller's request_hash. Let just get the caller's gid @@ -60,6 +60,6 @@ class delete_slice(Method): mgr_type = self.api.config.SFA_SM_TYPE manager_module = manager_base + ".slice_manager_%s" % mgr_type manager = __import__(manager_module, fromlist=[manager_base]) - manager.delete_slice(self.api, hrn, caller_cred) + manager.delete_slice(self.api, hrn, origin_hrn) return 1