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
Merge branch 'master' into senslab2
[sfa.git]
/
sfa
/
generic
/
slab.py
diff --git
a/sfa/generic/slab.py
b/sfa/generic/slab.py
index
f68fe41
..
5c9f780
100644
(file)
--- a/
sfa/generic/slab.py
+++ b/
sfa/generic/slab.py
@@
-3,10
+3,10
@@
from sfa.generic import Generic
import sfa.server.sfaapi
import sfa.senslab.slabdriver
import sfa.managers.registry_manager_slab
import sfa.server.sfaapi
import sfa.senslab.slabdriver
import sfa.managers.registry_manager_slab
-import sfa.managers.slice_manager
_slab
+import sfa.managers.slice_manager
import sfa.managers.aggregate_manager_slab
import sfa.managers.aggregate_manager_slab
-class
pl
(Generic):
+class
slab
(Generic):
# use the standard api class
def api_class (self):
# use the standard api class
def api_class (self):
@@
-16,13
+16,13
@@
class pl (Generic):
def registry_manager_class (self) :
return sfa.managers.registry_manager_slab
def slicemgr_manager_class (self) :
def registry_manager_class (self) :
return sfa.managers.registry_manager_slab
def slicemgr_manager_class (self) :
- return sfa.managers.slice_manager
_slab
+ return sfa.managers.slice_manager
.SliceManager
def aggregate_manager_class (self) :
def aggregate_manager_class (self) :
- return sfa.managers.aggregate_manager_slab
+ return sfa.managers.aggregate_manager_slab
.AggregateManager
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
# driver class for server-side services, talk to the whole testbed
def driver_class (self):
- return sfa.
plc
.slabdriver.SlabDriver
+ return sfa.
senslab
.slabdriver.SlabDriver
# slab does not have a component manager yet
# manager class
# slab does not have a component manager yet
# manager class