From: Josh Karlin <jkarlin@bbn.com>
Date: Mon, 11 Oct 2010 18:46:34 +0000 (-0400)
Subject: one more fix to renewsliver
X-Git-Tag: sfa-1.0-4~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=1d89a61f9d8e6147459c13c134e30decffa270f7;p=sfa.git

one more fix to renewsliver
---

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index c3b0c8af..8d10c534 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -21,6 +21,7 @@ import sfa.plc.peers as peers
 from sfa.plc.network import *
 from sfa.plc.api import SfaAPI
 from sfa.plc.slices import *
+from dateutil.parser import parse
 
 
 def __get_registry_objects(slice_xrn, creds, users):
@@ -189,7 +190,8 @@ def renew_slice(api, xrn, creds, expiration_time):
     if not slices:
         raise RecordNotFound(hrn)
     slice = slices[0]
-    slice['expires'] = int(time.mktime(expiration_time.timetuple()))
+    requested_time = parse(expiration_time)
+    slice['expires'] = int(time.mktime(requested_time.timetuple()))
     api.plshell.UpdateSlice(api.plauth, slice['slice_id'], slice)
     return 1         
 
diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index ab2063f8..3b965ff6 100644
--- a/sfa/methods/RenewSliver.py
+++ b/sfa/methods/RenewSliver.py
@@ -3,7 +3,6 @@ from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter
 from sfa.trust.credential import Credential
-from dateutil.parser import parse
 
 class RenewSliver(Method):
     """