From d43a95faead7c4cbdc7d79594b4464b2a4e458f7 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 3 Feb 2012 14:10:30 -0500 Subject: [PATCH 1/1] use default aggregate manager. OpenstackDriver renamed to NovaDriver --- sfa/generic/openstack.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 -- 2.43.0