Merge lp:~johannes.erdfelt/nova/lp820987 into lp:~hudson-openstack/nova/trunk

[Johannes Erdfelt]

The logic for confirming and reverting resizes was flipped. As a result, reverting a resize would end up deleting the source (instead of the destination) instance, and confirming would end up deleting the destination (instead of the source) instance.

This branch fixes the logic to be correct.

[Brian Lamar (blamar)]

Yeah, I'm unsure how this got switched up, but this logically makes a lot more sense.

review: Approve

[Josh Kearney (jk0)]

LGTM

review: Approve

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-08-03 11:31:10 +0000
+++ nova/compute/api.py	2011-08-04 16:01:18 +0000
@@ -888,7 +888,7 @@
         params = {'migration_id': migration_ref['id']}
         self._cast_compute_message('revert_resize', context,
                                    instance_ref['uuid'],
-                                   migration_ref['source_compute'],
+                                   migration_ref['dest_compute'],
                                    params=params)
 
         self.db.migration_update(context, migration_ref['id'],
@@ -908,7 +908,7 @@
         params = {'migration_id': migration_ref['id']}
         self._cast_compute_message('confirm_resize', context,
                                    instance_ref['uuid'],
-                                   migration_ref['dest_compute'],
+                                   migration_ref['source_compute'],
                                    params=params)
 
         self.db.migration_update(context, migration_ref['id'],