PL Driver: 1st shot rebase of PL operations around the HRN tags of Slice/Person/Site

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

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index e147041..4401275 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -17,7 +17,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, xrn_to_ext_slicename, top_auth
+from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, slicename_to_hrn, top_auth, hash_loginbase
 from sfa.planetlab.vlink import get_tc_rate
 from sfa.planetlab.topology import Topology
 
@@ -111,11 +111,16 @@ class PlAggregate:
 
         slice_urn = hrn_to_urn(slice_xrn, 'slice')
         slice_hrn, _ = urn_to_hrn(slice_xrn)
+
         top_auth_hrn = top_auth(slice_hrn)
+        site_hrn = '.'.join(slice_hrn.split('.')[:-1])
+        slice_part = slice_hrn.split('.')[-1]
         if top_auth_hrn == self.driver.hrn:
-            slice_name = hrn_to_pl_slicename(slice_hrn)
+            login_base = slice_hrn.split('.')[-2][:12]
         else:
-            slice_name = xrn_to_ext_slicename(slice_hrn)
+            login_base = hash_loginbase(site_hrn)
+
+        slice_name = '_'.join([login_base, slice_part])
 
         slices = self.driver.shell.GetSlices(slice_name)
         if not slices: