Merge branch 'master' into sqlalchemy

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

diff --git a/sfa/generic/openstack.py b/sfa/generic/openstack.py
index 024f291..bac57dc 100644 (file)
--- 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