git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More details in error message. NT.
[sfa.git]
/
sfa
/
methods
/
RenewSliver.py
diff --git
a/sfa/methods/RenewSliver.py
b/sfa/methods/RenewSliver.py
index
ab2063f
..
1669517
100644
(file)
--- a/
sfa/methods/RenewSliver.py
+++ b/
sfa/methods/RenewSliver.py
@@
-1,9
+1,10
@@
from sfa.util.faults import *
from sfa.util.faults import *
-from sfa.util.
namespace import *
+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.method import Method
from sfa.util.parameter import Parameter
from sfa.trust.credential import Credential
-from dateutil.parser import parse
+from sfa.util.sfatime import utcparse
+import datetime
class RenewSliver(Method):
"""
class RenewSliver(Method):
"""
@@
-17,12
+18,14
@@
class RenewSliver(Method):
accepts = [
Parameter(str, "Slice URN"),
Parameter(type([str]), "List of credentials"),
accepts = [
Parameter(str, "Slice URN"),
Parameter(type([str]), "List of credentials"),
- Parameter(str, "Expiration time in RFC 3339 format")
+ Parameter(str, "Expiration time in RFC 3339 format"),
+ Parameter(str, "call_id"),
]
returns = Parameter(bool, "Success or Failure")
]
returns = Parameter(bool, "Success or Failure")
- def call(self, slice_xrn, creds, expiration_time):
- hrn, type = urn_to_hrn(slice_xrn)
+ def call(self, slice_xrn, creds, expiration_time, call_id=""):
+
+ (hrn, type) = urn_to_hrn(slice_xrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, hrn, creds, self.name))
self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, hrn, creds, self.name))
@@
-30,12
+33,12
@@
class RenewSliver(Method):
valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', hrn)
# Validate that the time does not go beyond the credential's expiration time
valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', hrn)
# Validate that the time does not go beyond the credential's expiration time
- requested_time = parse(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(string=valid_creds[0]).get_expiration():
- raise InsufficientRights('SliverStatus: Credential expires before requested expiration time')
-
+ 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()
manager = self.api.get_interface_manager()
- manager.renew_slice(self.api, slice_xrn, valid_creds, expiration_time)
-
- return 1
+ return manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, call_id)