X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fpl.py;h=cbeabd11fa683c8fb7c3ccde3faba6fb1f1bcf43;hb=479fe75aba4509060c663c0025dac7398269f7ff;hp=098a27a390efc06254420567ef91763571488776;hpb=22629101f0eb055bbe3933937c5b342c3c8fc10b;p=sfa.git

diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index 098a27a3..cbeabd11 100644
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -1,35 +1,43 @@
 from sfa.generic import Generic
 
-import sfa.server.sfaapi
-import sfa.plc.pldriver
-import sfa.managers.registry_manager
-import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager
 
 class pl (Generic):
-    
+
+    # the importer class
+    def importer_class(self):
+        import sfa.importer.plimporter
+        return sfa.importer.plimporter.PlImporter
+
     # use the standard api class
-    def api_class (self):
+    def api_class(self):
+        import sfa.server.sfaapi
         return sfa.server.sfaapi.SfaApi
 
     # the manager classes for the server-side services
-    def registry_manager_class (self) : 
-        return sfa.managers.registry_manager
-    def slicemgr_manager_class (self) : 
+    def registry_manager_class(self):
+        import sfa.managers.registry_manager
+        return sfa.managers.registry_manager.RegistryManager
+
+    def slicemgr_manager_class(self):
+        import sfa.managers.slice_manager
         return sfa.managers.slice_manager.SliceManager
-    def aggregate_manager_class (self) :
+
+    def aggregate_manager_class(self):
+        import sfa.managers.aggregate_manager
         return sfa.managers.aggregate_manager.AggregateManager
 
     # driver class for server-side services, talk to the whole testbed
-    def driver_class (self):
-        return sfa.plc.pldriver.PlDriver
+    def driver_class(self):
+        import sfa.planetlab.pldriver
+        return sfa.planetlab.pldriver.PlDriver
 
     # for the component mode, to be run on board planetlab nodes
     # manager class
-    def component_manager_class (self):
+    def component_manager_class(self):
+        import sfa.managers
         return sfa.managers.component_manager_pl
     # driver_class
-    def component_driver_class (self):
-        return sfa.plc.plcomponentdriver.PlComponentDriver
-
 
+    def component_driver_class(self):
+        import sfa.planetlab.plcomponentdriver
+        return sfa.planetlab.plcomponentdriver.PlComponentDriver