Merge branch 'master' into senslab2

[sfa.git] / sfa / planetlab / plslices.py

diff --git a/sfa/plc/plslices.py b/sfa/planetlab/plslices.py
similarity index 99%
rename from sfa/plc/plslices.py
rename to sfa/planetlab/plslices.py
index 652b48d..90da404 100644 (file)
--- a/sfa/plc/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -5,11 +5,11 @@ 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.plc.vlink import VLink
-from sfa.util.plxrn import hrn_to_pl_slicename
+
+from sfa.planetlab.vlink import VLink
+from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
 
 MAXINT =  2L**31-1