X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRenew.py;h=288e97008a44fe5cb4274774c1f566fde098b4c0;hb=e5a8707bb06af0746a861edd5410701a8911da76;hp=5de5380035178d00cb3e6e24cd68eedaa6e24fbb;hpb=7fa748355d1af0ed4de2f8817cd648484e9043f2;p=sfa.git diff --git a/sfa/methods/Renew.py b/sfa/methods/Renew.py index 5de53800..288e9700 100644 --- a/sfa/methods/Renew.py +++ b/sfa/methods/Renew.py @@ -21,7 +21,7 @@ class Renew(Method): """ interfaces = ['aggregate', 'slicemgr'] accepts = [ - Parameter(str, "Slice URN"), + Parameter(type([str]), "Slice URN"), Parameter(type([str]), "List of credentials"), Parameter(str, "Expiration time in RFC 3339 format"), Parameter(dict, "Options"), @@ -33,12 +33,13 @@ class Renew(Method): self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, urns, creds, self.name)) # Find the valid credentials - valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', urns) + valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', urns, + check_sliver_callback = self.api.manager.driver.check_sliver_credentials) # Validate that the time does not go beyond the credential's expiration time requested_time = utcparse(expiration_time) max_renew_days = int(self.api.config.SFA_MAX_SLICE_RENEW) - if requested_time > Credential(string=valid_creds[0]).get_expiration(): + if requested_time > Credential(cred=valid_creds[0]).get_expiration(): raise InsufficientRights('Renewsliver: Credential expires before requested expiration time') if requested_time > datetime.datetime.utcnow() + datetime.timedelta(days=max_renew_days): raise Exception('Cannot renew > %s days from now' % max_renew_days)