Test fixes and some typos

4 files changed, 10 insertions, 23 deletions

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'})
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 8b541757a..50267e21f 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2185,8 +2185,8 @@ def instance_type_create(_context, values):
         instance_type_ref = models.InstanceTypes()
         instance_type_ref.update(values)
         instance_type_ref.save()
-    except:
-        raise exception.DBError
+    except Exception, e:
+        raise exception.DBError(e)
     return instance_type_ref
 
 
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 265421837..a6defd644 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -78,6 +78,7 @@ class ComputeTestCase(test.TestCase):
 
     def _create_instance_type(self, params={}):
         """Create a test instance"""
+        context = self.context.elevated()
         inst = {}
         inst['name'] = 'm1.small'
         inst['memory_mb'] = '1024'
@@ -88,7 +89,7 @@ class ComputeTestCase(test.TestCase):
         inst['rxtx_quota'] = 100
         inst['rxtx_cap'] = 200
         inst.update(params)
-        return db.instance_type_create(self.context, inst)['id']
+        return db.instance_type_create(context, inst)['id']
 
     def _create_group(self):
         values = {'name': 'testgroup',
@@ -292,8 +293,6 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance can be migrated/resized"""
         instance_id = self._create_instance()
         context = self.context.elevated()
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
 
         self.compute.run_instance(self.context, instance_id)
         db.instance_update(self.context, instance_id, {'host': 'foo'})
@@ -303,7 +302,6 @@ class ComputeTestCase(test.TestCase):
         self.compute.resize_instance(context, instance_id,
                 migration_ref['id'])
         self.compute.terminate_instance(context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')
 
     def test_resize_invalid_flavor_fails(self):
         """Ensure invalid flavors raise"""
@@ -311,32 +309,24 @@ class ComputeTestCase(test.TestCase):
         context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
 
-        self.assertRaises(exception.ApiError, self.compute_api.resize,
+        self.assertRaises(exception.NotFound, self.compute_api.resize,
                 context, instance_id, 200)
 
         self.compute.terminate_instance(context, instance_id)
 
     def test_resize_down_fails(self):
         """Ensure invalid flavors raise"""
+        context = self.context.elevated()
         instance_id = self._create_instance()
 
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
-        big_inst_type_id = self._create_instance_type(dict(flavorid=2,
-                name='m1.wowzers', memory_mb=8192))
-
-        context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
         db.instance_update(self.context, instance_id,
-                {'instance_type': 'm1.wowzers',
-                 'memory_gb': 8192})
+                {'instance_type': 'm1.xlarge'})
 
         self.assertRaises(exception.ApiError, self.compute_api.resize,
                 context, instance_id, 1)
 
         self.compute.terminate_instance(context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')
-        self.db.instance_type_purge(context, 'm1.wowzers')
 
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
@@ -346,10 +336,7 @@ class ComputeTestCase(test.TestCase):
         """Ensure instance fails to migrate when source and destination are
         the same host"""
         instance_id = self._create_instance()
-        small_inst_type_id = self._create_instance_type(dict(flavorid=1,
-                memory_mb=512, name='m1.small'))
         self.compute.run_instance(self.context, instance_id)
         self.assertRaises(exception.Error, self.compute.prep_resize,
                 self.context, instance_id, 1)
         self.compute.terminate_instance(self.context, instance_id)
-        self.db.instance_type_purge(context, 'm1.small')