X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fplslices.py;h=90da4046b03fac26f29e616317fc4d2ccbdd7df2;hb=d4fdf5099eff793459ad956b6a40ff85003cecc0;hp=ef049972e96c5dbcc9b7baee59b7da0dc22201ac;hpb=c4e713b97658195775b8fd147b8ab9dceb785493;p=sfa.git diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py index ef049972..90da4046 100644 --- a/sfa/planetlab/plslices.py +++ b/sfa/planetlab/plslices.py @@ -1,14 +1,15 @@ from types import StringTypes from collections import defaultdict +import sys 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.plxrn import PlXrn + from sfa.rspecs.rspec import RSpec + from sfa.planetlab.vlink import VLink -from sfa.util.plxrn import hrn_to_pl_slicename +from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename MAXINT = 2L**31-1 @@ -130,13 +131,11 @@ class PlSlices: # slice belongs to out local plc or a myplc peer. We will assume it # is a local site, unless we find out otherwise peer = None - # get this slice's authority (site) slice_authority = get_authority(hrn) # get this site's authority (sfa root authority or sub authority) site_authority = get_authority(slice_authority).lower() - # check if we are already peered with this site_authority, if so peers = self.driver.shell.GetPeers({}, ['peer_id', 'peername', 'shortname', 'hrn_root']) for peer_record in peers: