x/python-ganttclient
Code Issues Proposed changes

Reducing the number of compute calls to Glance

Browse Source 
Fixes bug 886224

Change-Id: Ibd270d24eb68cc2503fee933a2154125995d352d
This commit is contained in:
Brian Waldon
2011-11-04 12:44:30 -04:00
parent 8029a95d92
commit b3f10a8ef1
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_vmwareapi.py
View File

@@ -74,6 +74,12 @@ class VMWareAPIVMTestCase(test.TestCase):
'mac': 'DE:AD:BE:EF:00:00', 'mac': 'DE:AD:BE:EF:00:00',
'rxtx_cap': 3})] 'rxtx_cap': 3})]
self.image = {
'id': 'c1c8ce3d-c2e0-4247-890c-ccf5cc1c004c',
'disk_format': 'vhd',
'size': 512,
}
def tearDown(self): def tearDown(self):
super(VMWareAPIVMTestCase, self).tearDown() super(VMWareAPIVMTestCase, self).tearDown()
vmwareapi_fake.cleanup() vmwareapi_fake.cleanup()
@@ -95,7 +101,8 @@ class VMWareAPIVMTestCase(test.TestCase):
"""Create and spawn the VM.""" """Create and spawn the VM."""
self._create_instance_in_the_db() self._create_instance_in_the_db()
self.type_data = db.instance_type_get_by_name(None, 'm1.large') self.type_data = db.instance_type_get_by_name(None, 'm1.large')
self.conn.spawn(self.context, self.instance, self.network_info) self.conn.spawn(self.context, self.instance, self.image,
self.network_info)
self._check_vm_record() self._check_vm_record()
def _check_vm_record(self): def _check_vm_record(self):

25
nova/tests/test_xenapi.py
View File

@@ -423,7 +423,9 @@ class XenAPIVMTestCase(test.TestCase):
if empty_dns: if empty_dns:
network_info[0][1]['dns'] = [] network_info[0][1]['dns'] = []
self.conn.spawn(self.context, instance, network_info) image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD,
'disk_format': 'vhd'}
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_id)
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)
@@ -694,8 +696,10 @@ class XenAPIVMTestCase(test.TestCase):
'label': 'fake', 'label': 'fake',
'mac': 'DE:AD:BE:EF:00:00', 'mac': 'DE:AD:BE:EF:00:00',
'rxtx_cap': 3})] 'rxtx_cap': 3})]
image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD,
'disk_format': 'vhd'}
if spawn: if spawn:
self.conn.spawn(self.context, instance, network_info) self.conn.spawn(self.context, instance, image_meta, network_info)
return instance return instance
@@ -842,9 +846,10 @@ class XenAPIMigrateInstance(test.TestCase):
'label': 'fake', 'label': 'fake',
'mac': 'DE:AD:BE:EF:00:00', 'mac': 'DE:AD:BE:EF:00:00',
'rxtx_cap': 3})] 'rxtx_cap': 3})]
image_meta = {'id': instance.image_ref, 'disk_format': 'vhd'}
conn.finish_migration(self.context, self.migration, instance, conn.finish_migration(self.context, self.migration, instance,
dict(base_copy='hurr', cow='durr'), dict(base_copy='hurr', cow='durr'),
network_info, resize_instance=True) network_info, image_meta, resize_instance=True)
self.assertEqual(self.called, True) self.assertEqual(self.called, True)
self.assertEqual(self.fake_vm_start_called, True) self.assertEqual(self.fake_vm_start_called, True)
@@ -883,9 +888,10 @@ class XenAPIMigrateInstance(test.TestCase):
'label': 'fake', 'label': 'fake',
'mac': 'DE:AD:BE:EF:00:00', 'mac': 'DE:AD:BE:EF:00:00',
'rxtx_cap': 3})] 'rxtx_cap': 3})]
image_meta = {'id': instance.image_ref, 'disk_format': 'vhd'}
conn.finish_migration(self.context, self.migration, instance, conn.finish_migration(self.context, self.migration, instance,
dict(base_copy='hurr', cow='durr'), dict(base_copy='hurr', cow='durr'),
network_info, resize_instance=True) network_info, image_meta, resize_instance=True)
self.assertEqual(self.called, True) self.assertEqual(self.called, True)
self.assertEqual(self.fake_vm_start_called, True) self.assertEqual(self.fake_vm_start_called, True)
@@ -918,9 +924,10 @@ class XenAPIMigrateInstance(test.TestCase):
'label': 'fake', 'label': 'fake',
'mac': 'DE:AD:BE:EF:00:00', 'mac': 'DE:AD:BE:EF:00:00',
'rxtx_cap': 3})] 'rxtx_cap': 3})]
image_meta = {'id': instance.image_ref, 'disk_format': 'vhd'}
conn.finish_migration(self.context, self.migration, instance, conn.finish_migration(self.context, self.migration, instance,
dict(base_copy='hurr', cow='durr'), dict(base_copy='hurr', cow='durr'),
network_info, resize_instance=True) network_info, image_meta, resize_instance=True)
def test_finish_migrate_no_resize_vdi(self): def test_finish_migrate_no_resize_vdi(self):
instance = db.instance_create(self.context, self.instance_values) instance = db.instance_create(self.context, self.instance_values)
@@ -949,9 +956,10 @@ class XenAPIMigrateInstance(test.TestCase):
'rxtx_cap': 3})] 'rxtx_cap': 3})]
# Resize instance would be determined by the compute call # Resize instance would be determined by the compute call
image_meta = {'id': instance.image_ref, 'disk_format': 'vhd'}
conn.finish_migration(self.context, self.migration, instance, conn.finish_migration(self.context, self.migration, instance,
dict(base_copy='hurr', cow='durr'), dict(base_copy='hurr', cow='durr'),
network_info, resize_instance=False) network_info, image_meta, resize_instance=False)
class XenAPIImageTypeTestCase(test.TestCase): class XenAPIImageTypeTestCase(test.TestCase):
@@ -986,8 +994,9 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
def assert_disk_type(self, disk_type): def assert_disk_type(self, disk_type):
ctx = context.RequestContext('fake', 'fake') ctx = context.RequestContext('fake', 'fake')
dt = vm_utils.VMHelper.determine_disk_image_type( fake_glance = glance_stubs.FakeGlance('')
self.fake_instance, ctx) image_meta = fake_glance.get_image_meta(self.fake_instance.image_ref)
dt = vm_utils.VMHelper.determine_disk_image_type(image_meta)
self.assertEqual(disk_type, dt) self.assertEqual(disk_type, dt)
def test_instance_disk(self): def test_instance_disk(self):