X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRenewSliver.py;h=b34d424ab4ab9acdb62f9a325cf4a8bce6ef7022;hb=845abc0f39d56c0f1120f0a1226de5321076d10a;hp=6cbde77c387ae1b08253077427168a7e128cf183;hpb=9f7ec7438cee94d3049307b2c0edefb119a0b465;p=sfa.git diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py index 6cbde77c..b34d424a 100644 --- a/sfa/methods/RenewSliver.py +++ b/sfa/methods/RenewSliver.py @@ -1,10 +1,11 @@ -from sfa.util.faults import * +import datetime + +from sfa.util.faults import InsufficientRights from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method from sfa.util.parameter import Parameter from sfa.trust.credential import Credential from sfa.util.sfatime import utcparse -import datetime class RenewSliver(Method): """ @@ -34,10 +35,10 @@ class RenewSliver(Method): # 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(): raise InsufficientRights('Renewsliver: Credential expires before requested expiration time') - if requested_time > datetime.datetime.utcnow() + datetime.timedelta(days=60): - raise Exception('Cannot renew > 60 days from now') - manager = self.api.get_interface_manager() - return manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, call_id) + if requested_time > datetime.datetime.utcnow() + datetime.timedelta(days=max_renew_days): + raise Exception('Cannot renew > %s days from now' % max_renew_days) + return self.api.manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, call_id)