From 351b4cb4acbb8a0bd560b1feb249336cd7fa3dec Mon Sep 17 00:00:00 2001
From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 21 Jun 2012 15:49:45 +0200
Subject: [PATCH] Update in import packages.

---
 sfa/senslab/OARrestapi.py    | 4 ++--
 sfa/senslab/slabaggregate.py | 2 +-
 sfa/senslab/slabdriver.py    | 2 +-
 sfa/senslab/slabslices.py    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index 3622038b..304d8f26 100644
--- 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 1b190e7d..5b1eeeda 100644
--- 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 e0d97843..bb3b1b82 100644
--- 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 08fc5ff9..261c58c6 100644
--- 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
 
-- 
2.43.0