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
FIT IoT-Lab shell: modified add_user category of user is required
[sfa.git]
/
sfa
/
generic
/
openstack.py
diff --git
a/sfa/generic/openstack.py
b/sfa/generic/openstack.py
index
bac57dc
..
bd88e90
100644
(file)
--- a/
sfa/generic/openstack.py
+++ b/
sfa/generic/openstack.py
@@
-9,22
+9,21
@@
import sfa.managers.slice_manager
# use pl as a model so we only redefine what's different
from sfa.generic.pl import pl
# use pl as a model so we only redefine what's different
from sfa.generic.pl import pl
+
class openstack (pl):
class openstack (pl):
-
+
# the importer class
# the importer class
- def importer_class
(self):
+ def importer_class
(self):
import sfa.importer.openstackimporter
return sfa.importer.openstackimporter.OpenstackImporter
import sfa.importer.openstackimporter
return sfa.importer.openstackimporter.OpenstackImporter
-
+
# the manager classes for the server-side services
# the manager classes for the server-side services
- def registry_manager_class
(self) :
+ def registry_manager_class
(self):
return sfa.managers.registry_manager_openstack.RegistryManager
return sfa.managers.registry_manager_openstack.RegistryManager
- def aggregate_manager_class (self) :
+
+ def aggregate_manager_class(self):
return sfa.managers.aggregate_manager.AggregateManager
# driver class for server-side services, talk to the whole testbed
return sfa.managers.aggregate_manager.AggregateManager
# driver class for server-side services, talk to the whole testbed
- def driver_class
(self):
+ def driver_class(self):
return sfa.openstack.nova_driver.NovaDriver
return sfa.openstack.nova_driver.NovaDriver
-
-
-