Merge "Set instance['host'] to the original host value on revert resi…

…ze." into stable/diablo
openstack · Jan 11, 2012 · 02e94ac · 02e94ac
2 parents 8c48fa5 + 50f82d1
commit 02e94ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
@@ -928,6 +928,7 @@ def finish_revert_resize(self, context, instance_id, migration_id):
         self._instance_update(context,
                               instance_ref["uuid"],
                               memory_mb=instance_type['memory_mb'],
+                              host=migration_ref['source_compute'],
                               vcpus=instance_type['vcpus'],
                               local_gb=instance_type['local_gb'],
                               instance_type_id=instance_type['id'])

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
@@ -723,6 +723,7 @@ def fake(*args, **kwargs):
         instance_type_ref = db.instance_type_get(context,
                 inst_ref['instance_type_id'])
         self.assertEqual(instance_type_ref['flavorid'], 1)
+        self.assertEqual(inst_ref['host'], migration_ref['source_compute'])
 
         self.compute.terminate_instance(context, instance_id)