x/python-ganttclient
Code Issues Proposed changes

Fix live-migration in multi_host network

Browse Source 
* call teardown after live migration
 * call update a second time after migration for dhcp
 * moves the instance state update into post_live_migrate
 * completes the fix for bug 939060
 * fixes bug 947326

Change-Id: I042567573b9bb46381c5447aa08e83cd1916b225
This commit is contained in:
Vishvananda Ishaya
2012-03-08 12:53:44 -08:00
parent 060a482257
commit 034e5ec0d9
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/test_compute.py
View File

@@ -1387,26 +1387,24 @@ class ComputeTestCase(BaseTestCase):
self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance') self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
self.compute.driver.unfilter_instance(i_ref, []) self.compute.driver.unfilter_instance(i_ref, [])
self.mox.StubOutWithMock(rpc, 'call') self.mox.StubOutWithMock(rpc, 'call')
rpc.call(c, 'network', {'method': 'setup_networks_on_host',
'args': {'instance_id': instance_id,
'host': self.compute.host,
'teardown': True}})
rpc.call(c, db.queue_get_for(c, FLAGS.compute_topic, dest), rpc.call(c, db.queue_get_for(c, FLAGS.compute_topic, dest),
{"method": "post_live_migration_at_destination", {"method": "post_live_migration_at_destination",
"args": {'instance_id': i_ref['id'], 'block_migration': False}}) "args": {'instance_id': i_ref['id'], 'block_migration': False}})
self.mox.StubOutWithMock(self.compute.driver, 'unplug_vifs') self.mox.StubOutWithMock(self.compute.driver, 'unplug_vifs')
self.compute.driver.unplug_vifs(i_ref, []) self.compute.driver.unplug_vifs(i_ref, [])
rpc.call(c, 'network', {'method': 'setup_networks_on_host',
'args': {'instance_id': instance_id,
'host': self.compute.host,
'teardown': True}})
# start test # start test
self.mox.ReplayAll() self.mox.ReplayAll()
self.compute.post_live_migration(c, i_ref, dest) self.compute.post_live_migration(c, i_ref, dest)
# make sure every data is rewritten to destinatioin hostname. # make sure floating ips are rewritten to destinatioin hostname.
i_ref = db.instance_get(c, i_ref['id'])
c1 = (i_ref['host'] == dest)
flo_refs = db.floating_ip_get_all_by_host(c, dest) flo_refs = db.floating_ip_get_all_by_host(c, dest)
c2 = (len(flo_refs) != 0 and flo_refs[0]['address'] == flo_addr) self.assertTrue(flo_refs)
self.assertTrue(c1 and c2) self.assertEqual(flo_refs[0]['address'], flo_addr)
# cleanup # cleanup
db.instance_destroy(c, instance_id) db.instance_destroy(c, instance_id)