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
rough cleanup of the slicemanager business
[sfa.git]
/
sfa
/
generic
/
pl.py
diff --git
a/sfa/generic/pl.py
b/sfa/generic/pl.py
index
c8b1bc6
..
0e7fba9
100644
(file)
--- a/
sfa/generic/pl.py
+++ b/
sfa/generic/pl.py
@@
-1,40
+1,39
@@
from sfa.generic import Generic
from sfa.generic import Generic
+
class pl (Generic):
class pl (Generic):
-
+
# the importer class
# the importer class
- def importer_class
(self):
+ def importer_class
(self):
import sfa.importer.plimporter
return sfa.importer.plimporter.PlImporter
import sfa.importer.plimporter
return sfa.importer.plimporter.PlImporter
-
+
# use the standard api class
# 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
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
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
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.pl
c
.pldriver
- return sfa.pl
c
.pldriver.PlDriver
+ def driver_class(self):
+ import sfa.pl
anetlab
.pldriver
+ return sfa.pl
anetlab
.pldriver.PlDriver
# for the component mode, to be run on board planetlab nodes
# manager class
# for the component mode, to be run on board planetlab nodes
# manager class
- def component_manager_class
(self):
+ def component_manager_class(self):
import sfa.managers
return sfa.managers.component_manager_pl
# driver_class
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 component_driver_class(self):
+ import sfa.planetlab.plcomponentdriver
+ return sfa.planetlab.plcomponentdriver.PlComponentDriver