X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fpl.py;h=cbeabd11fa683c8fb7c3ccde3faba6fb1f1bcf43;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=aa0ef5bdaf6ddedef7d5eb9777d953a7c52b328b;hpb=d193c6bea9e5aab84d7143dc1e09cf29ee1912e7;p=sfa.git

diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index aa0ef5bd..cbeabd11 100644
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -1,23 +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):
-    
-    def api_class (self):
+
+    # 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
 
-    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 manager classes for the server-side services
+    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):
+        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
 
-    def driver_class (self):
-        return sfa.plc.pldriver.PlDriver
+    # for the component mode, to be run on board planetlab nodes
+    # manager class
+    def component_manager_class(self):
+        import sfa.managers
+        return sfa.managers.component_manager_pl
+    # driver_class
 
+    def component_driver_class(self):
+        import sfa.planetlab.plcomponentdriver
+        return sfa.planetlab.plcomponentdriver.PlComponentDriver