From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 3 Feb 2012 19:10:30 +0000 (-0500)
Subject: use default aggregate manager. OpenstackDriver renamed to NovaDriver
X-Git-Tag: merged-in-sfa-2.1-2~34
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d43a95faead7c4cbdc7d79594b4464b2a4e458f7;hp=bc9b16ab81c93e890dcd6723add5760cfde96472;p=sfa.git

use default aggregate manager. OpenstackDriver renamed to NovaDriver
---

diff --git a/sfa/generic/openstack.py b/sfa/generic/openstack.py
index 5c99d235..590bb573 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
 
 class openstack (Generic):
     
@@ -18,11 +18,11 @@ class openstack (Generic):
     def slicemgr_manager_class (self) : 
         return sfa.managers.slice_manager.SliceManager
     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
 
     # for the component mode, to be run on board planetlab nodes
     # manager class