X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fpeers.py;h=cb6b14cc506342d1218cb3638376acdcfea3d354;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hp=7c6e1b7c1e20cb9ca3370bfe8427f84070bf722b;hpb=30d9951e075d93127c3909dcb41be09b420b3525;p=sfa.git diff --git a/sfa/planetlab/peers.py b/sfa/planetlab/peers.py index 7c6e1b7c..cb6b14cc 100644 --- a/sfa/planetlab/peers.py +++ b/sfa/planetlab/peers.py @@ -1,7 +1,5 @@ from sfa.util.xrn import get_authority -from sfa.util.py23 import StringType - def get_peer(pldriver, hrn): # Because of myplc native federation, we first need to determine if this # slice belongs to out local plc or a myplc peer. We will assume it @@ -14,16 +12,18 @@ def get_peer(pldriver, 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 = pldriver.shell.GetPeers( {}, ['peer_id', 'peername', 'shortname', 'hrn_root']) + peers = pldriver.shell.GetPeers( + {}, ['peer_id', 'peername', 'shortname', 'hrn_root']) for peer_record in peers: - names = [name.lower() for name in peer_record.values() if isinstance(name, StringType)] + names = [name.lower() for name in list(peer_record.values()) + if isinstance(name, str)] if site_authority in names: peer = peer_record['shortname'] return peer -#def get_sfa_peer(pldriver, hrn): +# def get_sfa_peer(pldriver, hrn): # # return the authority for this hrn or None if we are the authority # sfa_peer = None # slice_authority = get_authority(hrn) @@ -33,4 +33,3 @@ def get_peer(pldriver, hrn): # sfa_peer = site_authority # # return sfa_peer -