From ba38ff28bfb8c2a36b880c4a781e67ce94a0bc49 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 25 Feb 2014 10:17:10 -0500 Subject: [PATCH] use plxrn to process xrns --- sfa/planetlab/plslices.py | 46 ++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py index 14179846..68ea2aab 100644 --- a/sfa/planetlab/plslices.py +++ b/sfa/planetlab/plslices.py @@ -323,13 +323,20 @@ class PlSlices: def verify_site(self, slice_xrn, slice_record={}, sfa_peer=None, options={}): - (slice_hrn, type) = urn_to_hrn(slice_xrn) - top_auth_hrn = top_auth(slice_hrn) - site_hrn = '.'.join(slice_hrn.split('.')[:-1]) - if top_auth_hrn == self.driver.hrn: - login_base = slice_hrn.split('.')[-2][:12] - else: - login_base = hash_loginbase(site_hrn) + #(slice_hrn, type) = urn_to_hrn(slice_xrn) + #top_auth_hrn = top_auth(slice_hrn) + #site_hrn = '.'.join(slice_hrn.split('.')[:-1]) + #if top_auth_hrn == self.driver.hrn: + # login_base = slice_hrn.split('.')[-2][:12] + #else: + # login_base = hash_loginbase(site_hrn) + plxrn = PlXrn(xrn=slice_xrn) + slice_hrn = plxrn.get_hrn() + type = plxrn.get_type() + site_hrn = plxrn.get_authority_hrn() + authority_name = plxrn.pl_authname() + slicename = plxrn.pl_slicename() + login_base = plxrn.pl_login_base() sites = self.driver.shell.GetSites({'peer_id': None},['site_id','name','abbreviated_name','login_base','hrn']) @@ -361,16 +368,21 @@ class PlSlices: def verify_slice(self, slice_hrn, slice_record, sfa_peer, expiration, options={}): - 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: - login_base = slice_hrn.split('.')[-2][:12] - else: - login_base = hash_loginbase(site_hrn) - - - slice_name = '_'.join([login_base, slice_part]) + #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: + # login_base = slice_hrn.split('.')[-2][:12] + #else: + # login_base = hash_loginbase(site_hrn) + #slice_name = '_'.join([login_base, slice_part]) + plxrn = PlXrn(xrn=slice_xrn) + slice_hrn = plxrn.get_hrn() + type = plxrn.get_type() + site_hrn = plxrn.get_authority_hrn() + authority_name = plxrn.pl_authname() + slicename = plxrn.pl_slicename() + login_base = plxrn.pl_login_base() slices = self.driver.shell.GetSlices({'peer_id': None},['slice_id','name','hrn']) # Filter slices by HRN -- 2.43.0