x/python-ganttclient
Code Issues Proposed changes

Merge "Access DB values as dict not as attributes. Part 4"

Browse Source
This commit is contained in:
Jenkins
2012-12-10 17:21:15 +00:00
committed by Gerrit Code Review
parent e7bb595a90 8ca0829123
commit 6a08d41f4f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/test_libvirt.py
View File

@@ -2094,7 +2094,7 @@ class LibvirtConnTestCase(test.TestCase):
_bandwidth).AndRaise(libvirt.libvirtError('ERR')) _bandwidth).AndRaise(libvirt.libvirtError('ERR'))
def fake_lookup(instance_name): def fake_lookup(instance_name):
if instance_name == instance_ref.name: if instance_name == instance_ref['name']:
return vdmock return vdmock
self.create_fake_libvirt_mock(lookupByName=fake_lookup) self.create_fake_libvirt_mock(lookupByName=fake_lookup)
@@ -2180,7 +2180,7 @@ class LibvirtConnTestCase(test.TestCase):
dummyjson) dummyjson)
self.assertTrue(os.path.exists('%s/%s/' % self.assertTrue(os.path.exists('%s/%s/' %
(tmpdir, instance_ref.name))) (tmpdir, instance_ref['name'])))
db.instance_destroy(self.context, instance_ref['uuid']) db.instance_destroy(self.context, instance_ref['uuid'])
@@ -2203,7 +2203,7 @@ class LibvirtConnTestCase(test.TestCase):
vdmock.XMLDesc(0).AndReturn(dummyxml) vdmock.XMLDesc(0).AndReturn(dummyxml)
def fake_lookup(instance_name): def fake_lookup(instance_name):
if instance_name == instance_ref.name: if instance_name == instance_ref['name']:
return vdmock return vdmock
self.create_fake_libvirt_mock(lookupByName=fake_lookup) self.create_fake_libvirt_mock(lookupByName=fake_lookup)
@@ -2229,7 +2229,7 @@ class LibvirtConnTestCase(test.TestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
info = conn.get_instance_disk_info(instance_ref.name) info = conn.get_instance_disk_info(instance_ref['name'])
info = jsonutils.loads(info) info = jsonutils.loads(info)
self.assertEquals(info[0]['type'], 'raw') self.assertEquals(info[0]['type'], 'raw')
self.assertEquals(info[0]['path'], '/test/disk') self.assertEquals(info[0]['path'], '/test/disk')
@@ -2302,7 +2302,7 @@ class LibvirtConnTestCase(test.TestCase):
conn.spawn(self.context, instance, None, [], 'herp', conn.spawn(self.context, instance, None, [], 'herp',
network_info=network_info) network_info=network_info)
path = os.path.join(CONF.instances_path, instance.name) path = os.path.join(CONF.instances_path, instance['name'])
if os.path.isdir(path): if os.path.isdir(path):
shutil.rmtree(path) shutil.rmtree(path)
@@ -3638,7 +3638,7 @@ class NWFilterTestCase(test.TestCase):
self.security_group = self.setup_and_return_security_group() self.security_group = self.setup_and_return_security_group()
db.instance_add_security_group(self.context, inst_uuid, db.instance_add_security_group(self.context, inst_uuid,
self.security_group.id) self.security_group['id'])
instance = db.instance_get(self.context, inst_id) instance = db.instance_get(self.context, inst_id)
network_info = _fake_network_info(self.stubs, 1) network_info = _fake_network_info(self.stubs, 1)
@@ -3655,7 +3655,7 @@ class NWFilterTestCase(test.TestCase):
break break
_ensure_all_called(mac, allow_dhcp) _ensure_all_called(mac, allow_dhcp)
db.instance_remove_security_group(self.context, inst_uuid, db.instance_remove_security_group(self.context, inst_uuid,
self.security_group.id) self.security_group['id'])
self.teardown_security_group() self.teardown_security_group()
db.instance_destroy(context.get_admin_context(), instance_ref['uuid']) db.instance_destroy(context.get_admin_context(), instance_ref['uuid'])
@@ -3673,7 +3673,7 @@ class NWFilterTestCase(test.TestCase):
self.security_group = self.setup_and_return_security_group() self.security_group = self.setup_and_return_security_group()
db.instance_add_security_group(self.context, inst_uuid, db.instance_add_security_group(self.context, inst_uuid,
self.security_group.id) self.security_group['id'])
instance = db.instance_get(self.context, inst_id) instance = db.instance_get(self.context, inst_id)