X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fplaggregate.py;h=fdd70e5f29a2b6eb02b11b00aa3c1b8b9e22d4ad;hb=f41d4566c5db5ac9b36a5a86ded828197fe3b1fd;hp=879f9bb96f5367b868ef90f5d4f58c15331d01bc;hpb=3b98a10239c828ebe5f3c1991667697bea00407b;p=sfa.git diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 879f9bb9..fdd70e5f 100644 --- 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 = {}