x/gantt
Code Issues Proposed changes

Broke parts of compute manager out into compute.api to separate what gets run on the API side vs the worker side.

Browse Source
This commit is contained in:
Eric Day
2010-12-01 09:24:39 -08:00
parent 5ab117827a
commit 744adf1eb2
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/manager.py
View File

@@ -53,23 +53,19 @@ This module provides Manager, a base class for managers.
from nova import utils from nova import utils
from nova import flags from nova import flags
from nova.db import base
from twisted.internet import defer from twisted.internet import defer
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
flags.DEFINE_string('db_driver', 'nova.db.api',
'driver to use for volume creation')
class Manager(object): class Manager(base.Base):
"""DB driver is injected in the init method"""
def __init__(self, host=None, db_driver=None): def __init__(self, host=None, db_driver=None):
if not host: if not host:
host = FLAGS.host host = FLAGS.host
self.host = host self.host = host
if not db_driver: super(Manager, self).__init__(db_driver)
db_driver = FLAGS.db_driver
self.db = utils.import_object(db_driver) # pylint: disable-msg=C0103
@defer.inlineCallbacks @defer.inlineCallbacks
def periodic_tasks(self, context=None): def periodic_tasks(self, context=None):

8
nova/tests/compute_unittest.py
View File

@@ -31,6 +31,7 @@ from nova import flags
from nova import test from nova import test
from nova import utils from nova import utils
from nova.auth import manager from nova.auth import manager
from nova.compute import api as compute_api
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -43,6 +44,7 @@ class ComputeTestCase(test.TrialTestCase):
self.flags(connection_type='fake', self.flags(connection_type='fake',
network_manager='nova.network.manager.FlatManager') network_manager='nova.network.manager.FlatManager')
self.compute = utils.import_object(FLAGS.compute_manager) self.compute = utils.import_object(FLAGS.compute_manager)
self.compute_api = compute_api.ComputeAPI()
self.manager = manager.AuthManager() self.manager = manager.AuthManager()
self.user = self.manager.create_user('fake', 'fake', 'fake') self.user = self.manager.create_user('fake', 'fake', 'fake')
self.project = self.manager.create_project('fake', 'fake', 'fake') self.project = self.manager.create_project('fake', 'fake', 'fake')
@@ -76,9 +78,9 @@ class ComputeTestCase(test.TrialTestCase):
'user_id': self.user.id, 'user_id': self.user.id,
'project_id': self.project.id} 'project_id': self.project.id}
group = db.security_group_create(self.context, values) group = db.security_group_create(self.context, values)
ref = self.compute.create_instance(self.context, ref = self.compute_api.create_instance(self.context,
security_groups=[group['id']], security_groups=[group['id']],
**inst) **inst)
# reload to get groups # reload to get groups
instance_ref = db.instance_get(self.context, ref['id']) instance_ref = db.instance_get(self.context, ref['id'])
try: try: