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
Some emails from LDAP are missing = set field to None.
[sfa.git]
/
sfa
/
generic
/
slab.py
diff --git
a/sfa/generic/slab.py
b/sfa/generic/slab.py
index
16c8a13
..
7923af0
100644
(file)
--- a/
sfa/generic/slab.py
+++ b/
sfa/generic/slab.py
@@
-1,11
+1,9
@@
from sfa.generic import Generic
import sfa.server.sfaapi
from sfa.generic import Generic
import sfa.server.sfaapi
-import sfa.senslab.slabdriver
-import sfa.managers.registry_manager
-import sfa.managers.slice_manager
-#import sfa.managers.aggregate_manager_slab
-import sfa.managers.aggregate_manager
+
+
+
class slab (Generic):
# use the standard api class
class slab (Generic):
# use the standard api class
@@
-18,15
+16,21
@@
class slab (Generic):
return sfa.importer.slabimporter.SlabImporter
# the manager classes for the server-side services
return sfa.importer.slabimporter.SlabImporter
# 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
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
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
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):
+ import sfa.senslab.slabdriver
return sfa.senslab.slabdriver.SlabDriver
# slab does not have a component manager yet
return sfa.senslab.slabdriver.SlabDriver
# slab does not have a component manager yet