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
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
sfa
/
generic
/
iotlab.py
diff --git
a/sfa/generic/iotlab.py
b/sfa/generic/iotlab.py
index
22f9310
..
14cd3cc
100644
(file)
--- a/
sfa/generic/iotlab.py
+++ b/
sfa/generic/iotlab.py
@@
-3,37
+3,26
@@
from sfa.generic import Generic
import sfa.server.sfaapi
import sfa.server.sfaapi
-
class iotlab (Generic):
# use the standard api class
class iotlab (Generic):
# use the standard api class
- def api_class
(self):
+ def api_class(self):
return sfa.server.sfaapi.SfaApi
# the importer class
return sfa.server.sfaapi.SfaApi
# the importer class
- def importer_class
(self):
+ def importer_class(self):
import sfa.importer.iotlabimporter
return sfa.importer.iotlabimporter.IotLabImporter
# the manager classes for the server-side services
import sfa.importer.iotlabimporter
return sfa.importer.iotlabimporter.IotLabImporter
# 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
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) :
+ def aggregate_manager_class(self):
import sfa.managers.aggregate_manager
return sfa.managers.aggregate_manager.AggregateManager
import sfa.managers.aggregate_manager
return sfa.managers.aggregate_manager.AggregateManager
- def driver_class
(self):
+ def driver_class(self):
import sfa.iotlab.iotlabdriver
return sfa.iotlab.iotlabdriver.IotLabDriver
import sfa.iotlab.iotlabdriver
return sfa.iotlab.iotlabdriver.IotLabDriver
-
- def component_manager_class (self):
- return None
- # driver_class
- def component_driver_class (self):
- return None
\ No newline at end of file