X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fgeneric%2Fpl.py;h=457a09b4b571b85f532b41dc0b266fb978213b18;hb=0f90da7f05fbe3d07e56790c10f6ecc877b33754;hp=92b7266fb96e67ec11f9c68a7ad6966e75b79641;hpb=efd5d7736f4d07356ff2ebb53c1123335007fa8e;p=sfa.git diff --git a/sfa/generic/pl.py b/sfa/generic/pl.py index 92b7266f..457a09b4 100644 --- a/sfa/generic/pl.py +++ b/sfa/generic/pl.py @@ -1,8 +1,12 @@ from sfa.generic import Generic - 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): import sfa.server.sfaapi @@ -21,15 +25,16 @@ class pl (Generic): # driver class for server-side services, talk to the whole testbed def driver_class (self): - import sfa.plc.pldriver - return sfa.plc.pldriver.PlDriver + 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): + import sfa.managers return sfa.managers.component_manager_pl # driver_class def component_driver_class (self): - return sfa.plc.plcomponentdriver.PlComponentDriver - + import sfa.planetlab.plcomponentdriver + return sfa.planetlab.plcomponentdriver.PlComponentDriver