Functionality fixed and new test passing

1 files changed, 8 insertions, 4 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index b91e6b9af..eb3996d29 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -720,7 +720,8 @@ class ComputeManager(manager.SchedulerDependentManager):
         self.db.instance_update(context, instance_id,
            dict(memory_mb=instance_type['memory_mb'],
                 vcpus=instance_type['vcpus'],
-                local_gb=instance_type['local_gb']))
+                local_gb=instance_type['local_gb'],
+                instance_type_id=instance_type['id']))
 
         self.driver.revert_resize(instance_ref)
         self.db.migration_update(context, migration_id,
@@ -741,14 +742,14 @@ class ComputeManager(manager.SchedulerDependentManager):
         """
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
+
         if instance_ref['host'] == FLAGS.host:
             raise exception.Error(_(
                     'Migration error: destination same as source!'))
 
-        old_instance_type = self.db.instance_type_get_by_flavor_id(context,
+        old_instance_type = self.db.instance_type_get_by_id(context,
                 instance_ref['instance_type_id'])
-        instance_type = self.db.instance_type_get_by_flavor_id(context,
-                flavor_id)
+
         migration_ref = self.db.migration_create(context,
                 {'instance_id': instance_id,
                  'source_compute': instance_ref['host'],
@@ -768,6 +769,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                        'migration_id': migration_ref['id'],
                        'instance_id': instance_id, },
                 })
+
+        instance_type = self.db.instance_type_get_by_flavor_id(context,
+                flavor_id)
         usage_info = utils.usage_from_instance(instance_ref,
                               new_instance_type=instance_type['name'],
                               new_instance_type_id=instance_type['id'])