From f1bd2c681b28cce7d520fafd89682077290a79cb Mon Sep 17 00:00:00 2001 From: Josh Karlin Date: Mon, 11 Oct 2010 14:23:37 -0400 Subject: [PATCH] Fixed renewsliver arguments in slice manager. Fixed a bug in namespace --- sfa/managers/aggregate_manager_pl.py | 2 +- sfa/methods/RenewSliver.py | 2 +- sfa/util/namespace.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index eca0c775..c3b0c8af 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -189,7 +189,7 @@ def renew_slice(api, xrn, creds, expiration_time): if not slices: raise RecordNotFound(hrn) slice = slices[0] - slice['expires'] = expiration_time + slice['expires'] = int(time.mktime(expiration_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 c337bc06..ab2063f8 100644 --- a/sfa/methods/RenewSliver.py +++ b/sfa/methods/RenewSliver.py @@ -35,7 +35,7 @@ class RenewSliver(Method): raise InsufficientRights('SliverStatus: Credential expires before requested expiration time') manager = self.api.get_interface_manager() - manager.renew_slice(self.api, slice_xrn, valid_creds, requested_time) + manager.renew_slice(self.api, slice_xrn, valid_creds, expiration_time) return 1 diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py index 3ed03ab8..3251b997 100644 --- a/sfa/util/namespace.py +++ b/sfa/util/namespace.py @@ -94,7 +94,7 @@ def urn_to_hrn(urn): # Remove the authority name (e.g. '.sa') if type == 'authority': - urn_parts = hrn_parts[:-1] + urn_parts = urn_parts[:-1] # convert hrn_parts (list) into hrn (str) by doing the following # 1. remove blank elements -- 2.47.0