group db-related stuff in sfa/storage

[sfa.git] / sfa / methods / RenewSliver.py

diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index 1d7c540..a380d99 100644 (file)
--- a/sfa/methods/RenewSliver.py
+++ b/sfa/methods/RenewSliver.py
@@ -1,9 +1,13 @@
-from sfa.util.faults import *
-from sfa.util.namespace import urn_to_hrn
+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.util.sfatime import utcparse
+
 from sfa.trust.credential import Credential
-from dateutil.parser import parse
+
+from sfa.storage.parameter import Parameter
 
 class RenewSliver(Method):
     """
@@ -17,12 +21,14 @@ class RenewSliver(Method):
     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(dict, "Options"),
         ]
     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, options={}):
+
+        (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))
 
@@ -30,12 +36,11 @@ 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
-        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():
-            raise InsufficientRights('SliverStatus: Credential expires before requested expiration time')
-       
-        manager = self.api.get_interface_manager()
-        manager.renew_slice(self.api, slice_xrn, valid_creds, expiration_time)    
- 
-        return 1
+            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)
+        return self.api.manager.RenewSliver(self.api, slice_xrn, valid_creds, expiration_time, options)