X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fpl.py;h=2d3b95b7d78618dd67705d4a861247ea498ac38f;hb=052e281f8c79237b6759cbb259407f071adda1cc;hp=c8b1bc685b427d698022216ac82eabdb67e743e9;hpb=78467ecd9b02ec60d9572178995ed347fc917f59;p=sfa.git

diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index c8b1bc68..2d3b95b7 100644
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -1,40 +1,28 @@
 from sfa.generic import Generic
 
+
 class pl (Generic):
-    
+
     # the importer class
-    def importer_class (self): 
+    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) : 
+    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):
-        import sfa.plc.pldriver
-        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.plc.plcomponentdriver
-        return sfa.plc.plcomponentdriver.PlComponentDriver
-
+    def driver_class(self):
+        import sfa.planetlab.pldriver
+        return sfa.planetlab.pldriver.PlDriver