Better mgt of external slices/users/sites + fixes

[sfa.git] / sfa / planetlab / plaggregate.py

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index 879f9bb..fdd70e5 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -18,7 +18,7 @@ from sfa.rspecs.elements.lease import Lease
 from sfa.rspecs.elements.granularity import Granularity
 from sfa.rspecs.version_manager import VersionManager
 
-from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, slicename_to_hrn
+from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, slicename_to_hrn, xrn_to_ext_slicename, top_auth
 from sfa.planetlab.vlink import get_tc_rate
 from sfa.planetlab.topology import Topology
 from sfa.storage.alchemy import dbsession
@@ -130,14 +130,11 @@ class PlAggregate:
                     pass 
             else:  
                 slice_hrn = xrn.get_hrn()
-                site_hrn = get_authority(slice_hrn)
-                top_auth_hrn = site_hrn.split('.')[0]
+                top_auth_hrn = top_auth(slice_hrn)
                 if top_auth_hrn == self.driver.hrn:
                     slice_name = hrn_to_pl_slicename(slice_hrn)
                 else:
-                    login_base = '8'.join(site_hrn.split('.'))
-                    slice_name = '_'.join([login_base, get_leaf(slice_hrn)])
-                
+                    slice_name = xrn_to_ext_slicename(slice_hrn) 
                 names.add(slice_name)
 
         filter = {}