Renaming Senslab into Iotlab.

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

diff --git a/sfa/generic/slab.py b/sfa/generic/iotlab.py
similarity index 65%
rename from sfa/generic/slab.py
rename to sfa/generic/iotlab.py
index e4a474b..7ca346b 100644 (file)
--- a/sfa/generic/slab.py
+++ b/sfa/generic/iotlab.py
@@ -4,41 +4,44 @@ import sfa.server.sfaapi
 
 
 
-class slab (Generic):
-    
+class iotlab (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
-    
+    def importer_class (self):
+        import sfa.importer.iotlabimporter
+        return sfa.importer.iotlabimporter.IotlabImporter
+
     # the manager classes for the server-side services
     def registry_manager_class (self) :
-        import sfa.managers.registry_manager 
+        import sfa.managers.registry_manager
         return sfa.managers.registry_manager.RegistryManager
-    
+
     def slicemgr_manager_class (self) :
-        import sfa.managers.slice_manager 
+        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):
+<<<<<<< HEAD:sfa/generic/slab.py
         import sfa.managers.v2_to_v3_adapter
         return sfa.managers.v2_to_v3_adapter.V2ToV3Adapter
+=======
+        import sfa.iotlab.iotlabdriver
+        return sfa.iotlab.iotlabdriver.IotlabDriver
+>>>>>>> 7cb1e78... Renaming Senslab into Iotlab.:sfa/generic/iotlab.py
 
-    # slab does not have a component manager yet
+    # iotlab does not have a component manager yet
     # manager class
     def component_manager_class (self):
         return None
     # driver_class
     def component_driver_class (self):
         return None
-
-