added support for geni_extend_alap (as long as possible) in RenewSliver

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 97b748e..2ad3f9c 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -1,6 +1,8 @@
 import socket
 import socket

+import datetime

 from sfa.util.version import version_core
 from sfa.util.version import version_core

-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrni
+from sfa.util.sfatime import utcpase, adjust_datetime

 from sfa.util.callids import Callids
 from sfa.server.api_versions import ApiVersions
 
 from sfa.util.callids import Callids
 from sfa.server.api_versions import ApiVersions
 


@@ -87,6 +89,14 @@ class AggregateManager:
         xrn = Xrn(xrn, 'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()
         xrn = Xrn(xrn, 'slice')
         slice_urn=xrn.get_urn()
         slice_hrn=xrn.get_hrn()

+
+        if options.get('geni_extend_alap'):
+            now = datetime.datetime.now()
+            requested = utcparse(expiration_time)
+            max = adjust_datetime(now, days=30)
+            if requested > max:
+                expiration_time = max
+     

         return self.driver.renew_sliver (slice_urn, slice_hrn, creds, expiration_time, options)
     
     ### these methods could use an options extension for at least call_id
         return self.driver.renew_sliver (slice_urn, slice_hrn, creds, expiration_time, options)
     
     ### these methods could use an options extension for at least call_id

diff --git a/sfa/util/sfatime.py b/sfa/util/sfatime.py
index 4879689..e34a64e 100644 (file)
--- a/sfa/util/sfatime.py
+++ b/sfa/util/sfatime.py
@@ -64,3 +64,11 @@ def datetime_to_utc(input):
 
 def datetime_to_epoch(input):
     return int(time.mktime(input.timetuple()))
 
 def datetime_to_epoch(input):
     return int(time.mktime(input.timetuple()))

+
+def adjust_datetime(input, days=0, hours=0, minutes=0, seconds=0):
+    """
+    Adjust the input date by the specified delta (in seconds).
+    """
+    dt = utcparse(input)
+    return dt + datetime.timedelta(days=days, hours=hours, minutes=minutes, seconds=seconds)
+