From 034e5ec0d9c849d6ad869b88f1ef7d444b32df71 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 8 Mar 2012 12:53:44 -0800
Subject: [PATCH] Fix live-migration in multi_host network

 * 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
---
 nova/tests/test_compute.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index bcfe90e0..f30fefeb 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -1387,26 +1387,24 @@ class ComputeTestCase(BaseTestCase):
         self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
         self.compute.driver.unfilter_instance(i_ref, [])
         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),
             {"method": "post_live_migration_at_destination",
              "args": {'instance_id': i_ref['id'], 'block_migration': False}})
         self.mox.StubOutWithMock(self.compute.driver, 'unplug_vifs')
         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
         self.mox.ReplayAll()
         self.compute.post_live_migration(c, i_ref, dest)
 
-        # make sure every data is rewritten to destinatioin hostname.
-        i_ref = db.instance_get(c, i_ref['id'])
-        c1 = (i_ref['host'] == dest)
+        # make sure floating ips are rewritten to destinatioin hostname.
         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(c1 and c2)
+        self.assertTrue(flo_refs)
+        self.assertEqual(flo_refs[0]['address'], flo_addr)
 
         # cleanup
         db.instance_destroy(c, instance_id)