Update in import packages.

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index 3622038..304d8f2 100644 (file)
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -3,11 +3,11 @@ import httplib
 import json
 import datetime
 from time import gmtime, strftime 
-from sfa.senslab.parsing import *
+
 import urllib
 import urllib2
 from sfa.util.config import Config
-from sfa.util.plxrn import PlXrn
+from sfa.planetlab.plxrn import PlXrn
 from sfa.util.xrn import hrn_to_urn, get_authority,Xrn,get_leaf
 
 from sfa.util.config import Config

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index 1b190e7..5b1eeed 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -9,7 +9,7 @@ import json
 
 from sfa.util.config import Config
 from sfa.util.xrn import hrn_to_urn, urn_to_hrn, urn_to_sliver_id
-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.rspecs.rspec import RSpec
 from sfa.rspecs.elements.location import Location

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index e0d9784..bb3b1b8 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -21,7 +21,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
 from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id
-from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
 
 ## thierry: everything that is API-related (i.e. handling incoming requests) 
 # is taken care of 

diff --git a/sfa/senslab/slabslices.py b/sfa/senslab/slabslices.py
index 08fc5ff..261c58c 100644 (file)
--- a/sfa/senslab/slabslices.py
+++ b/sfa/senslab/slabslices.py
@@ -2,10 +2,10 @@ from types import StringTypes
 from collections import defaultdict
 import sys
 from sfa.util.xrn import get_leaf, get_authority, urn_to_hrn
-from sfa.util.plxrn import hrn_to_pl_slicename
+from sfa.planetlab.plxrn import hrn_to_pl_slicename
 from sfa.util.policy import Policy
 from sfa.rspecs.rspec import RSpec
-from sfa.plc.vlink import VLink
+
 from sfa.util.xrn import Xrn
 from sfa.util.sfalogging import logger