Migrate DHCP host info during resize

Update instance host to migration_ref['dest_compute'] before
update_dhcp to make its DHCP host info will be written in dhcp-hostsfile.

Make similiar change in finish_revert_resize.

Fixes bug 1065440

Change-Id: I9d3e0ebf8512f98f2943999e7ad95bc58f2bf585

1 files changed, 12 insertions, 0 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index cad27b544..d48edc376 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1822,6 +1822,9 @@ class ComputeTestCase(BaseTestCase):
         self.compute.resize_instance(context, instance=instance,
                                      migration_id=migration_ref['id'],
                                      image={})
+        inst = db.instance_get_by_uuid(context, instance['uuid'])
+        self.assertEqual(migration_ref['dest_compute'], inst['host'])
+
         self.compute.terminate_instance(context,
             instance=jsonutils.to_primitive(instance))
 
@@ -1882,6 +1885,15 @@ class ComputeTestCase(BaseTestCase):
         self.compute.revert_resize(context,
                 migration_id=migration_ref['id'], instance=rpcinst,
                 reservations=reservations)
+
+        def fake_setup_networks_on_host(cls, ctxt, instance, host):
+            self.assertEqual(host, migration_ref['source_compute'])
+            inst = db.instance_get_by_uuid(ctxt, instance['uuid'])
+            self.assertEqual(host, inst['host'])
+
+        self.stubs.Set(network_api.API, 'setup_networks_on_host',
+                       fake_setup_networks_on_host)
+
         self.compute.finish_revert_resize(context,
                 migration_id=migration_ref['id'], instance=rpcinst,
                 reservations=reservations)