RSpecVersion.todict() needs to turn values() into a list()

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

diff --git a/sfa/generic/iotlab.py b/sfa/generic/iotlab.py
index 7ca346b..22f9310 100644 (file)
--- a/sfa/generic/iotlab.py
+++ b/sfa/generic/iotlab.py
@@ -13,7 +13,7 @@ class iotlab (Generic):
     # the importer class
     def importer_class (self):
         import sfa.importer.iotlabimporter
-        return sfa.importer.iotlabimporter.IotlabImporter
+        return sfa.importer.iotlabimporter.IotLabImporter
 
     # the manager classes for the server-side services
     def registry_manager_class (self) :
@@ -28,20 +28,12 @@ class iotlab (Generic):
         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
+        return sfa.iotlab.iotlabdriver.IotLabDriver
 
-    # 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
+        return None
\ No newline at end of file