X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fpl.py;h=2d3b95b7d78618dd67705d4a861247ea498ac38f;hb=3147e8e089dd44e40b852cc121483189807ffa9b;hp=853053d14ede4578964feebee9d3cd8fbe4ed9d1;hpb=70f4308757e799aeb96545f5e0a22c96dc8633c2;p=sfa.git

diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index 853053d1..2d3b95b7 100644
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -1,19 +1,28 @@
 from sfa.generic import Generic
-import sfa.plc.plcsfaapi
-import sfa.managers.registry_manager
-import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager
+
 
 class pl (Generic):
-    
-    def api_class (self):
-        return sfa.plc.plcsfaapi.PlcSfaApi
 
-    def registry_class (self) : 
-        return sfa.managers.registry_manager
-    def slicemgr_class (self) : 
-        return sfa.managers.slice_manager
-    def aggregate_class (self) :
-        return sfa.managers.aggregate_manager
+    # 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):
+        import sfa.server.sfaapi
+        return sfa.server.sfaapi.SfaApi
+
+    # the manager classes for the server-side services
+    def registry_manager_class(self):
+        import sfa.managers.registry_manager
+        return sfa.managers.registry_manager.RegistryManager
 
+    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):
+        import sfa.planetlab.pldriver
+        return sfa.planetlab.pldriver.PlDriver