git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed sfa/plc into sfa/planetlab
[sfa.git]
/
sfa
/
generic
/
pl.py
diff --git
a/sfa/generic/pl.py
b/sfa/generic/pl.py
index
098a27a
..
457a09b
100644
(file)
--- a/
sfa/generic/pl.py
+++ b/
sfa/generic/pl.py
@@
-1,35
+1,40
@@
from sfa.generic import Generic
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):
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):
# 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) :
return sfa.server.sfaapi.SfaApi
# the manager classes for the server-side services
def registry_manager_class (self) :
- return sfa.managers.registry_manager
+ import sfa.managers.registry_manager
+ return sfa.managers.registry_manager.RegistryManager
def slicemgr_manager_class (self) :
def slicemgr_manager_class (self) :
+ import sfa.managers.slice_manager
return sfa.managers.slice_manager.SliceManager
def aggregate_manager_class (self) :
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):
return sfa.managers.aggregate_manager.AggregateManager
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
- 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):
# 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.managers.component_manager_pl
# driver_class
def component_driver_class (self):
-
return sfa.plc.plcomponentdriver.PlComponentD
river
-
+
import sfa.planetlab.plcomponentd
river
+ return sfa.planetlab.plcomponentdriver.PlComponentDriver