From 7bf7342cffc8e0d38694a1f013d7e77e6eaff2a7 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 21 Jan 2014 21:20:29 -0500 Subject: [PATCH] added support for geni_extend_alap (as long as possible) in RenewSliver --- sfa/managers/aggregate_manager.py | 9 +++++++++ sfa/util/sfatime.py | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 7c4bacb6..5108c4ff 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -145,6 +145,15 @@ class AggregateManager: def Renew(self, api, xrns, creds, expiration_time, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return True + + # extend as long as possible + 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 api.driver.renew(xrns, expiration_time, options) def PerformOperationalAction(self, api, xrns, creds, action, options={}): diff --git a/sfa/util/sfatime.py b/sfa/util/sfatime.py index 48796892..992785e1 100644 --- a/sfa/util/sfatime.py +++ b/sfa/util/sfatime.py @@ -64,3 +64,10 @@ def datetime_to_utc(input): 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) -- 2.43.0