X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2Fplimporter.py;h=ab37ac9fc13503e124660c46d594335c9bca7956;hb=8a8c1cf266637f8477e480debe46cb4d866c4f9e;hp=d205a87b6cc46f319d51f1e83b7bfe4ea3f1e630;hpb=0f90da7f05fbe3d07e56790c10f6ecc877b33754;p=sfa.git diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py index d205a87b..ab37ac9f 100644 --- a/sfa/importer/plimporter.py +++ b/sfa/importer/plimporter.py @@ -20,7 +20,6 @@ import os from sfa.util.config import Config from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn -from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename from sfa.trust.gid import create_uuid from sfa.trust.certificate import convert_public_key, Keypair @@ -29,6 +28,7 @@ from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey from sfa.planetlab.plshell import PlShell +from sfa.planetlab.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename def _get_site_hrn(interface_hrn, site): # Hardcode 'internet2' into the hrn for sites hosting