X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fgeneric%2Fopenstack.py;h=bac57dc7610d3a3f9a95348d28cfed980c692732;hp=024f291430c30bb824f6bdd0a631715790548db8;hb=b7d6a80faf23cb019c74e65c2264e215446f84a3;hpb=25dc07a3f55ef5e21c659dcaad5ad7559e8a6896

diff --git a/sfa/generic/openstack.py b/sfa/generic/openstack.py
index 024f2914..bac57dc7 100644
--- a/sfa/generic/openstack.py
+++ b/sfa/generic/openstack.py
@@ -1,10 +1,10 @@
 from sfa.generic import Generic
 
 import sfa.server.sfaapi
-import sfa.openstack.openstack_driver
+import sfa.openstack.nova_driver
 import sfa.managers.registry_manager_openstack
+import sfa.managers.aggregate_manager
 import sfa.managers.slice_manager
-import sfa.managers.aggregate_manager_openstack
 
 # use pl as a model so we only redefine what's different
 from sfa.generic.pl import pl
@@ -20,11 +20,11 @@ class openstack (pl):
     def registry_manager_class (self) : 
         return sfa.managers.registry_manager_openstack.RegistryManager
     def aggregate_manager_class (self) :
-        return sfa.managers.aggregate_manager_openstack.AggregateManager
+        return sfa.managers.aggregate_manager.AggregateManager
 
     # driver class for server-side services, talk to the whole testbed
     def driver_class (self):
-        return sfa.openstack.openstack_driver.OpenstackDriver
+        return sfa.openstack.nova_driver.NovaDriver