diff options
| author | matt.dietz@rackspace.com <> | 2011-07-21 11:52:58 -0500 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-21 11:52:58 -0500 |
| commit | 1230d93f6154d73fcd8ce1c30c629d8a04c1c874 (patch) | |
| tree | d7b9849226fc7a022fab468e3ed29645de73bfa4 | |
| parent | 5fbe60d4b51017732740535f147f6d48764b2006 (diff) | |
| download | nova-1230d93f6154d73fcd8ce1c30c629d8a04c1c874.tar.gz nova-1230d93f6154d73fcd8ce1c30c629d8a04c1c874.tar.xz nova-1230d93f6154d73fcd8ce1c30c629d8a04c1c874.zip | |
Some broken tests from my other merge
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 6 |
2 files changed, 4 insertions, 4 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, diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index dc3f0596d..ce32ff1de 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -535,7 +535,7 @@ class ComputeTestCase(test.TestCase): # Confirm the instance size before the resize starts inst_ref = db.instance_get(context, instance_id) - instance_type_ref = db.instance_type_get_by_id(context, + instance_type_ref = db.instance_type_get(context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], 1) @@ -553,7 +553,7 @@ class ComputeTestCase(test.TestCase): # Prove that the instance size is now the new size inst_ref = db.instance_get(context, instance_id) - instance_type_ref = db.instance_type_get_by_id(context, + instance_type_ref = db.instance_type_get(context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], 3) @@ -564,7 +564,7 @@ class ComputeTestCase(test.TestCase): migration_ref['id']) inst_ref = db.instance_get(context, instance_id) - instance_type_ref = db.instance_type_get_by_id(context, + instance_type_ref = db.instance_type_get(context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], 1) |