X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRenewSliver.py;h=4a0e8361ef9e5e09d77255ac8a01cb4ae0e1b3d6;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=bce8a49528d53411224031e0e68357be59ddac1d;hpb=952322d76247f8991f3c2688ed7e1f5a22ca4572;p=sfa.git

diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index bce8a495..4a0e8361 100644
--- a/sfa/methods/RenewSliver.py
+++ b/sfa/methods/RenewSliver.py
@@ -1,9 +1,11 @@
-from sfa.util.faults import *
-from sfa.util.namespace 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 dateutil.parser import parse
+from sfa.util.sfatime import utcparse
 
 class RenewSliver(Method):
     """
@@ -13,34 +15,31 @@ class RenewSliver(Method):
     @param expiration_time (string) requested time of expiration
     
     """
-    interfaces = ['geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     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")
 
-    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))
 
         # Find the valid credentials
-        ValidCreds = self.api.auth.checkCredentials(creds, 'renewsliver', hrn)
+        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)
-        if requested_time > Credential(string=ValidCreds[0]).get_lifetime():
-            raise InsufficientRights('SliverStatus: Credential expires before requested expiration time')
-        
-        manager_base = 'sfa.managers'
-
-        if self.api.interface in ['geni_am']:
-            mgr_type = self.api.config.SFA_GENI_AGGREGATE_TYPE
-            manager_module = manager_base + ".geni_am_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            return manager.RenewSliver(self.api, slice_xrn, ValidCreds, expiration_time)
-
-        return ''
+        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=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)