diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-12 19:27:48 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-12 19:27:48 -0700 |
| commit | b2a95bc859b3b52adb71efc4445924e1dbbdd06a (patch) | |
| tree | c042af97b4a578016bb693fbd30d872ae64186ef | |
| parent | dbbdebbcd13b08ec2afb6d0d58144eeee6ecce84 (diff) | |
| download | nova-b2a95bc859b3b52adb71efc4445924e1dbbdd06a.tar.gz nova-b2a95bc859b3b52adb71efc4445924e1dbbdd06a.tar.xz nova-b2a95bc859b3b52adb71efc4445924e1dbbdd06a.zip | |
fix tests
| -rw-r--r-- | nova/tests/network_unittest.py | 3 | ||||
| -rw-r--r-- | nova/tests/virt_unittest.py | 15 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
3 files changed, 14 insertions, 7 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index c81f93bb3..3afb4d19e 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -58,7 +58,8 @@ class NetworkTestCase(test.TrialTestCase): user_context = context.APIRequestContext(project=self.projects[i], user=self.user) network_ref = self.network.get_network(user_context) - self.network.set_network_host(user_context, network_ref['id']) + self.network.set_network_host(context.get_admin_context(), + network_ref['id']) instance_ref = self._create_instance(0) self.instance_id = instance_ref['id'] instance_ref = self._create_instance(1) diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py index 684347473..13f976715 100644 --- a/nova/tests/virt_unittest.py +++ b/nova/tests/virt_unittest.py @@ -20,21 +20,22 @@ from xml.dom.minidom import parseString as xml_to_dom from nova import db from nova import flags from nova import test +from nova import utils from nova.api import context from nova.api.ec2 import cloud from nova.auth import manager - -# Needed to get FLAGS.instances_path defined: -from nova.compute import manager as compute_manager from nova.virt import libvirt_conn FLAGS = flags.FLAGS +flags.DECLARE('instances_path', 'nova.compute.manager') class LibvirtConnTestCase(test.TrialTestCase): def setUp(self): + super(LibvirtConnTestCase, self).setUp() self.manager = manager.AuthManager() self.user = self.manager.create_user('fake', 'fake', 'fake', admin=True) self.project = self.manager.create_project('fake', 'fake', 'fake') + self.network = utils.import_object(FLAGS.network_manager) FLAGS.instances_path = '' def test_get_uri_and_template(self): @@ -51,11 +52,15 @@ class LibvirtConnTestCase(test.TrialTestCase): 'instance_type' : 'm1.small'} instance_ref = db.instance_create(None, instance) - network_ref = db.project_get_network(None, self.project.id) + user_context = context.APIRequestContext(project=self.project, + user=self.user) + network_ref = self.network.get_network(user_context) + self.network.set_network_host(context.get_admin_context(), + network_ref['id']) fixed_ip = { 'address' : ip, 'network_id' : network_ref['id'] } - + fixed_ip_ref = db.fixed_ip_create(None, fixed_ip) db.fixed_ip_update(None, ip, { 'allocated' : True, 'instance_id' : instance_ref['id'] }) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 6ef5aa472..94a36a530 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -320,7 +320,8 @@ class LibvirtConnection(object): def to_xml(self, instance): # TODO(termie): cache? logging.debug('instance %s: starting toXML method', instance['name']) - network = db.instance_get_fixed_by_instance(None, inst['id']) + network = db.project_get_network(None, + instance['project_id']) # FIXME(vish): stick this in db instance_type = instance_types.INSTANCE_TYPES[instance['instance_type']] ip_address = db.instance_get_fixed_address({}, instance['id']) |