Fixed renewsliver arguments in slice manager. Fixed a bug in namespace

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index eca0c77..c3b0c8a 100644 (file)
--- 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]
     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         
 
     api.plshell.UpdateSlice(api.plauth, slice['slice_id'], slice)
     return 1         
 

diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index c337bc0..ab2063f 100644 (file)
--- 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()
             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
     
  
         return 1
     

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index 3ed03ab..3251b99 100644 (file)
--- 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':
          
     # 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
 
     # convert hrn_parts (list) into hrn (str) by doing the following
     # 1. remove blank elements