Merge branch 'master' into senslab2

[sfa.git] / sfa / generic / slab.py

diff --git a/sfa/generic/slab.py b/sfa/generic/slab.py
index 0d1df18..7923af0 100644 (file)
--- a/sfa/generic/slab.py
+++ b/sfa/generic/slab.py
@@ -1,27 +1,36 @@
 from sfa.generic import Generic
 
 import sfa.server.sfaapi
-import sfa.senslab.slabdriver
-import sfa.managers.registry_manager_slab
-import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager
+
+
 
 class slab (Generic):
     
     # use the standard api class
     def api_class (self):
         return sfa.server.sfaapi.SfaApi
-
+    
+    # the importer class
+    def importer_class (self): 
+        import sfa.importer.slabimporter
+        return sfa.importer.slabimporter.SlabImporter
+    
     # the manager classes for the server-side services
-    def registry_manager_class (self) : 
-        return sfa.managers.registry_manager_slab
-    def slicemgr_manager_class (self) : 
+    def registry_manager_class (self) :
+        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) :
+        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.senslab.slabdriver
         return sfa.senslab.slabdriver.SlabDriver
 
     # slab does not have a component manager yet