Using generic registry manager.
[sfa.git] / sfa / generic / slab.py
index f68fe41..5bb8710 100644 (file)
@@ -2,11 +2,11 @@ from sfa.generic import Generic
 
 import sfa.server.sfaapi
 import sfa.senslab.slabdriver
-import sfa.managers.registry_manager_slab
-import sfa.managers.slice_manager_slab
-import sfa.managers.aggregate_manager_slab
-
-class pl (Generic):
+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
     def api_class (self):
@@ -14,15 +14,15 @@ class pl (Generic):
 
     # the manager classes for the server-side services
     def registry_manager_class (self) : 
-        return sfa.managers.registry_manager_slab
+        return sfa.managers.registry_manager.RegistryManager
     def slicemgr_manager_class (self) : 
-        return sfa.managers.slice_manager_slab
+        return sfa.managers.slice_manager.SliceManager
     def aggregate_manager_class (self) :
-        return sfa.managers.aggregate_manager_slab
+        return sfa.managers.aggregate_manager.AggregateManager
 
     # 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