summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authormatt.dietz@rackspace.com <>2011-07-21 11:52:58 -0500
committermatt.dietz@rackspace.com <>2011-07-21 11:52:58 -0500
commit1230d93f6154d73fcd8ce1c30c629d8a04c1c874 (patch)
treed7b9849226fc7a022fab468e3ed29645de73bfa4 /nova/compute
parent5fbe60d4b51017732740535f147f6d48764b2006 (diff)
Some broken tests from my other merge
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c9afa8072..893727f38 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -748,7 +748,7 @@ class ComputeManager(manager.SchedulerDependentManager):
raise exception.Error(_(
'Migration error: destination same as source!'))
- old_instance_type = self.db.instance_type_get_by_id(context,
+ old_instance_type = self.db.instance_type_get(context,
instance_ref['instance_type_id'])
migration_ref = self.db.migration_create(context,