X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRenewSliver.py;h=c64b8841943ff5386cb20ab3a5f6134f9f4bc311;hb=062f69a840aec2971420ba5ff8d3361923df7f74;hp=4a0e8361ef9e5e09d77255ac8a01cb4ae0e1b3d6;hpb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;p=sfa.git diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py index 4a0e8361..c64b8841 100644 --- a/sfa/methods/RenewSliver.py +++ b/sfa/methods/RenewSliver.py @@ -3,10 +3,12 @@ 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 +from sfa.trust.credential import Credential + +from sfa.storage.parameter import Parameter + class RenewSliver(Method): """ Renews the resources in a sliver, extending the lifetime of the slice. @@ -20,11 +22,11 @@ class RenewSliver(Method): Parameter(str, "Slice URN"), Parameter(type([str]), "List of credentials"), Parameter(str, "Expiration time in RFC 3339 format"), - Parameter(str, "call_id"), + Parameter(dict, "Options"), ] returns = Parameter(bool, "Success or Failure") - def call(self, slice_xrn, creds, expiration_time, call_id=""): + def call(self, slice_xrn, creds, expiration_time, options): (hrn, type) = urn_to_hrn(slice_xrn) @@ -40,6 +42,5 @@ class RenewSliver(Method): 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) - manager = self.api.get_interface_manager() - return manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, call_id) + return self.api.manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, options)