From e509cd70e7a2e8a430b2b24af50adcf1ad763564 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Mon, 14 Mar 2011 17:24:39 +0000
Subject: Test fixes and some typos

---
 nova/compute/api.py     | 4 ++--
 nova/compute/manager.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 9d238c7d0..0e9bf2424 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -468,13 +468,13 @@ class API(base.Base):
         instance = self.db.instance_get(context, instance_id)
         current_instance_type = self.db.instance_type_get_by_name(
             context, instance['instance_type'])
-        
+
         new_instance_type = self.db.instance_type_get_by_flavor_id(
                 context, flavor_id)
         if not new_instance_type:
             raise exception.ApiError(_("Requested flavor does not exist"))
 
-        if current_instance_type.memory_mb > new_instance_typ.memory_mb:
+        if current_instance_type['memory_mb'] > new_instance_type['memory_mb']:
             raise exception.ApiError(_("Invalid flavor: cannot downsize"
                     "instances"))
 
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index f73e81345..57d175ec7 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -479,7 +479,7 @@ class ComputeManager(manager.Manager):
                  'source_compute': instance_ref['host'],
                  'dest_compute': FLAGS.host,
                  'dest_host':   self.driver.get_host_ip_addr(),
-                 'old_flavor_id': instance_type['flavor_id'],
+                 'old_flavor_id': instance_type['flavorid'],
                  'new_flavor_id': flavor_id,
                  'status':      'pre-migrating'})
 
-- 
cgit