X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_slices.py;h=402bf0a7aeb8d2c0e2787db68d25f3053a9def83;hb=74f579cc69a3610c0a6a206c38f6a429d67e5822;hp=2c50e2b75ff895aa5b535299fb449b785f5a4444;hpb=b6f8c8bc125665abeaf605bc16d6c4f47b075327;p=sfa.git diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py index 2c50e2b7..402bf0a7 100644 --- a/sfa/methods/get_slices.py +++ b/sfa/methods/get_slices.py @@ -2,7 +2,6 @@ ### $URL$ from sfa.util.faults import * -from sfa.util.misc import * from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed from sfa.trust.auth import Auth @@ -21,20 +20,20 @@ class get_slices(Method): accepts = [ Parameter(str, "Credential string"), - Mixed(Parameter(str, "Request hash"), - Parameter(None, "Request hash not specified")) + Mixed(Parameter(str, "Human readable name of the original caller"), + Parameter(None, "Origin hrn not specified")) ] returns = [Parameter(str, "Human readable slice name (hrn)")] - def call(self, cred, request_hash=None): + def call(self, cred, origin_hrn=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)) + if not origin_hrn: + origin_hrn = user_cred.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, None, self.name)) - self.api.auth.authenticateCred(cred, [cred], request_hash) + # validate the cred self.api.auth.check(cred, 'listslices') slices = []