moved sfa/util/plxrn as sfa/planetlab/plxrn

diff --git a/sfa/clientbin/sfiListNodes.py b/sfa/clientbin/sfiListNodes.py
index 3de1657..17cb341 100755 (executable)
--- a/sfa/clientbin/sfiListNodes.py
+++ b/sfa/clientbin/sfiListNodes.py
@@ -1,9 +1,12 @@
 #! /usr/bin/env python
 
 import sys
+
 from sfa.client.sfi_commands import Commands
+
 from sfa.rspecs.rspec import RSpec
-from sfa.util.plxrn import xrn_to_hostname 
+
+from sfa.planetlab.plxrn import xrn_to_hostname 
 
 command = Commands(usage="%prog [options]",
                    description="List all nodes in the RSpec. " + 

diff --git a/sfa/clientbin/sfiListSlivers.py b/sfa/clientbin/sfiListSlivers.py
index c869f61..c9611d0 100755 (executable)
--- a/sfa/clientbin/sfiListSlivers.py
+++ b/sfa/clientbin/sfiListSlivers.py
@@ -2,8 +2,10 @@
 
 import sys
 from sfa.client.sfi_commands import Commands
+
 from sfa.rspecs.rspec import RSpec
-from sfa.util.plxrn import xrn_to_hostname
+
+from sfa.planetlab.plxrn import xrn_to_hostname
 
 command = Commands(usage="%prog [options]",
                    description="List all slivers in the RSpec. " + 

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index d9c3d8f..b12ef03 100644 (file)
--- a/sfa/importer/openstackimporter.py
+++ b/sfa/importer/openstackimporter.py
@@ -2,11 +2,13 @@ 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
+
 from sfa.trust.gid import create_uuid    
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegUser, RegSlice, RegNode
+
+from sfa.planetlab.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn
 from sfa.openstack.nova_shell import NovaShell    
 
 def load_keys(filename):

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index d205a87..ab37ac9 100644 (file)
--- 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

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 950d2f2..228361d 100644 (file)
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -17,18 +17,20 @@ from sqlobject import *
 
 from sfa.util.faults import InvalidRSpec 
 from sfa.util.xrn import urn_to_hrn, Xrn
-from sfa.util.plxrn import slicename_to_hrn
 from sfa.util.callids import Callids
 #comes with its own logging
 #from sfa.util.sfalogging import logger
 from sfa.util.version import version_core
 
 from sfa.trust.credential import Credential
-from sfa.planetlab.plaggregate import PlAggregate
-from sfa.planetlab.plslices import PlSlices
+
 from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
+from sfa.planetlab.plaggregate import PlAggregate
+from sfa.planetlab.plslices import PlSlices
+from sfa.planetlab.plxrn import slicename_to_hrn
+
 ##
 # Meta data of an instance.
 #

diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py
index 9630479..8518839 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,10 +1,12 @@
 import xmlrpclib
 
 from sfa.util.faults import SliverDoesNotExist
-from sfa.util.plxrn import PlXrn
-from sfa.trust.sfaticket import SfaTicket
 from sfa.util.version import version_core
 
+from sfa.trust.sfaticket import SfaTicket
+
+from sfa.planetlab.plxrn import PlXrn
+
 def GetVersion(api, options):
     return version_core({'interface':'component',
                          'testbed':'myplc'})

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index dcb81d4..ccf6852 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -15,7 +15,7 @@ from sfa.rspecs.elements.services import Services
 from sfa.rspecs.elements.pltag import PLTag
 from sfa.rspecs.version_manager import VersionManager
 
-from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
 from sfa.planetlab.vlink import get_tc_rate
 from sfa.planetlab.topology import Topology
 

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index b73fcf7..0fb4fc3 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -27,7 +27,7 @@ from sfa.planetlab.plshell import PlShell
 import sfa.planetlab.peers as peers
 from sfa.planetlab.plaggregate import PlAggregate
 from sfa.planetlab.plslices import PlSlices
-from sfa.util.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
 
 
 def list_to_dict(recs, key):

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index ef04997..f7c8848 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -4,11 +4,11 @@ from collections import defaultdict
 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
 

diff --git a/sfa/util/plxrn.py b/sfa/planetlab/plxrn.py
similarity index 100%
rename from sfa/util/plxrn.py
rename to sfa/planetlab/plxrn.py

diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py
index 9927683..9892d8c 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2Node.py
+++ b/sfa/rspecs/elements/versions/pgv2Node.py
@@ -1,6 +1,6 @@
-from sfa.util.plxrn import xrn_to_hostname
 from sfa.util.xrn import Xrn
 from sfa.util.xml import XpathFilter
+
 from sfa.rspecs.elements.node import Node
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.location import Location
@@ -12,6 +12,8 @@ from sfa.rspecs.elements.pltag import PLTag
 from sfa.rspecs.elements.versions.pgv2Services import PGv2Services     
 from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType     
 
+from sfa.planetlab.plxrn import xrn_to_hostname
+
 class PGv2Node:
     @staticmethod
     def add_nodes(xml, nodes):

diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py
index fefc9a1..d8db263 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Node.py
+++ b/sfa/rspecs/elements/versions/sfav1Node.py
@@ -1,7 +1,7 @@
 from sfa.util.sfalogging import logger
 from sfa.util.xml import XpathFilter
-from sfa.util.plxrn import xrn_to_hostname
 from sfa.util.xrn import Xrn
+
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.node import Node
 from sfa.rspecs.elements.sliver import Sliver
@@ -15,6 +15,8 @@ from sfa.rspecs.elements.versions.sfav1Sliver import SFAv1Sliver
 from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
 
+from sfa.planetlab.plxrn import xrn_to_hostname
+
 class SFAv1Node:
 
     @staticmethod

diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py
index f037533..94cecd1 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Sliver.py
+++ b/sfa/rspecs/elements/versions/sfav1Sliver.py
@@ -1,10 +1,12 @@
 from sfa.util.xrn import Xrn
-from sfa.util.plxrn import PlXrn
 from sfa.util.xml import XmlElement
+
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 
+from sfa.planetlab.plxrn import PlXrn
+
 class SFAv1Sliver:
 
     @staticmethod

diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py
index 589a572..f75f1ca 100755 (executable)
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -6,14 +6,16 @@ from optparse import OptionParser
 
 from sfa.util.faults import ConnectionKeyGIDMismatch
 from sfa.util.config import Config
-from sfa.client.sfaserverproxy import SfaServerProxy
-from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn
 
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 from sfa.trust.gid import GID
 from sfa.trust.hierarchy import Hierarchy
 
+from sfa.client.sfaserverproxy import SfaServerProxy
+
+from sfa.planetlab.plxrn import hrn_to_pl_slicename, slicename_to_hrn
+
 KEYDIR = "/var/lib/sfa/"
 CONFDIR = "/etc/sfa/"
 

diff --git a/tests/testXrn.py b/tests/testXrn.py
index 709ce6b..f681205 100755 (executable)
--- a/tests/testXrn.py
+++ b/tests/testXrn.py
@@ -4,7 +4,8 @@ import unittest
 
 from sfa.util.faults import *
 from sfa.util.xrn import Xrn
-from sfa.util.plxrn import PlXrn
+
+from sfa.planetlab.plxrn import PlXrn
 
 verbose=False