x/python-ganttclient
Code Issues Proposed changes

Simplify _get_vm_opaque_ref in xenapi driver

Browse Source 
Full instance objects are passed to all methods now, so it no longer
needs to handle three different variants of argument. Also, make sure
most code uses _get_vm_opaque_ref instead of calling VMHelper.lookup
directly so it checks that a vm_ref was actually returned.

Change-Id: Icc8b819e1d4b8bf342867d09e61fe05e6eab9e70
This commit is contained in:
Johannes Erdfelt
2012-04-12 21:37:15 +00:00
parent 6b39b2c95e
commit ef61f650e7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_xenapi.py
View File

@@ -330,12 +330,12 @@ class XenAPIVMTestCase(test.TestCase):
name_label = vdi_rec["name_label"] name_label = vdi_rec["name_label"]
self.assert_(not name_label.endswith('snapshot')) self.assert_(not name_label.endswith('snapshot'))
def create_vm_record(self, conn, os_type, instance_id=1): def create_vm_record(self, conn, os_type, name):
instances = conn.list_instances() instances = conn.list_instances()
self.assertEquals(instances, [str(instance_id)]) self.assertEquals(instances, [name])
# Get Nova record for VM # Get Nova record for VM
vm_info = conn.get_info({'name': instance_id}) vm_info = conn.get_info({'name': name})
# Get XenAPI record for VM # Get XenAPI record for VM
vms = [rec for ref, rec vms = [rec for ref, rec
in xenapi_fake.get_all_records('VM').iteritems() in xenapi_fake.get_all_records('VM').iteritems()
@@ -483,7 +483,7 @@ class XenAPIVMTestCase(test.TestCase):
image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD, image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD,
'disk_format': 'vhd'} 'disk_format': 'vhd'}
self.conn.spawn(self.context, instance, image_meta, network_info) self.conn.spawn(self.context, instance, image_meta, network_info)
self.create_vm_record(self.conn, os_type, instance_id) self.create_vm_record(self.conn, os_type, instance['name'])
self.check_vm_record(self.conn, check_injection) self.check_vm_record(self.conn, check_injection)
self.assertTrue(instance.os_type) self.assertTrue(instance.os_type)
self.assertTrue(instance.architecture) self.assertTrue(instance.architecture)
@@ -988,6 +988,7 @@ class XenAPIMigrateInstance(test.TestCase):
def test_migrate_disk_and_power_off_passes_exceptions(self): def test_migrate_disk_and_power_off_passes_exceptions(self):
instance = db.instance_create(self.context, self.instance_values) instance = db.instance_create(self.context, self.instance_values)
xenapi_fake.create_vm(instance.name, 'Running')
instance_type = db.instance_type_get_by_name(self.context, 'm1.large') instance_type = db.instance_type_get_by_name(self.context, 'm1.large')
stubs.stubout_session(self.stubs, stubs.FakeSessionForMigrationTests) stubs.stubout_session(self.stubs, stubs.FakeSessionForMigrationTests)