~eday/nova/compute-abstraction

« back to all changes in this revision

Viewing changes to nova/tests/compute_unittest.py

  • Committer: Eric Day
  • Date: 2010-12-01 17:24:39 UTC
  • Revision ID: eday@oddments.org-20101201172439-dsvrviu9kixjkl29
Broke parts of compute manager out into compute.api to separate what gets run on the API side vs the worker side.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
from nova import test
32
32
from nova import utils
33
33
from nova.auth import manager
 
34
from nova.compute import api as compute_api
34
35
 
35
36
FLAGS = flags.FLAGS
36
37
 
43
44
        self.flags(connection_type='fake',
44
45
                   network_manager='nova.network.manager.FlatManager')
45
46
        self.compute = utils.import_object(FLAGS.compute_manager)
 
47
        self.compute_api = compute_api.ComputeAPI()
46
48
        self.manager = manager.AuthManager()
47
49
        self.user = self.manager.create_user('fake', 'fake', 'fake')
48
50
        self.project = self.manager.create_project('fake', 'fake', 'fake')
76
78
                  'user_id': self.user.id,
77
79
                  'project_id': self.project.id}
78
80
        group = db.security_group_create(self.context, values)
79
 
        ref = self.compute.create_instance(self.context,
80
 
                                           security_groups=[group['id']],
81
 
                                           **inst)
 
81
        ref = self.compute_api.create_instance(self.context,
 
82
                                               security_groups=[group['id']],
 
83
                                               **inst)
82
84
        # reload to get groups
83
85
        instance_ref = db.instance_get(self.context, ref['id'])
84
86
        try: