review management of relationships - allow to update them with sfaadmin

[sfa.git] / sfa / plc / plslices.py

diff --git a/sfa/plc/plslices.py b/sfa/plc/plslices.py
index 898210e..9413e81 100644 (file)
--- a/sfa/plc/plslices.py
+++ b/sfa/plc/plslices.py
@@ -5,7 +5,7 @@ from sfa.util.sfatime import utcparse, datetime_to_epoch
 from sfa.util.sfalogging import logger
 from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
 #from sfa.util.policy import Policy
-from sfa.util.xrn import Xrn
+from sfa.util.plxrn import PlXrn
 from sfa.rspecs.rspec import RSpec
 from sfa.plc.vlink import VLink
 from sfa.util.plxrn import hrn_to_pl_slicename
@@ -342,9 +342,10 @@ class PlSlices:
                 # unbind from peer so we can modify if necessary. Will bind back later
                 self.driver.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
                #Update existing record (e.g. expires field) it with the latest info.
-            requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
-            if requested_expires and slice['expires'] != requested_expires:
-                self.driver.shell.UpdateSlice( slice['slice_id'], {'expires' : requested_expires})
+            if slice_record.get('expires'):
+                requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
+                if requested_expires and slice['expires'] != requested_expires:
+                    self.driver.shell.UpdateSlice( slice['slice_id'], {'expires' : requested_expires})
        
         return slice
 
@@ -356,7 +357,7 @@ class PlSlices:
         for user in users:
             hrn, type = urn_to_hrn(user['urn'])
             username = get_leaf(hrn)
-            login_base = get_leaf(get_authority(user['urn']))
+            login_base = PlXrn(xrn=user['urn']).pl_login_base()
             user['username'] = username
             user['site'] = login_base