Merge branch 'thgeneric' of ssh://git.onelab.eu/git/sfa into thgeneric

[sfa.git] / sfa / generic / pl.py

diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py
index 853053d..167b58a 100644 (file)
--- a/sfa/generic/pl.py
+++ b/sfa/generic/pl.py
@@ -1,19 +1,35 @@
 from sfa.generic import Generic
-import sfa.plc.plcsfaapi
+
+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):
     
+    # use the standard api class
     def api_class (self):
-        return sfa.plc.plcsfaapi.PlcSfaApi
+        return sfa.server.sfaapi.SfaApi
 
-    def registry_class (self) : 
+    # the manager classes for the server-side services
+    def registry_manager_class (self) : 
         return sfa.managers.registry_manager
-    def slicemgr_class (self) : 
+    def slicemgr_manager_class (self) : 
         return sfa.managers.slice_manager
-    def aggregate_class (self) :
+    def aggregate_manager_class (self) :
         return sfa.managers.aggregate_manager
 
+    # driver class for server-side services, talk to the whole testbed
+    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):
+        return sfa.managers.component_manager_pl
+    # driver_class
+    def component_driver_class (self):
+        return sfa.plc.plcomponentdriver.PlComponentDriver
+