fixes nova-manage instance_type compatibility with postgres db

4 files changed, 8 insertions, 8 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 6dcdddd5e..013a6077b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -874,7 +874,7 @@ class InstanceTypeCommands(object):
             if name == None:
                 inst_types = instance_types.get_all_types()
             elif name == "--all":
-                inst_types = instance_types.get_all_types(1)
+                inst_types = instance_types.get_all_types(True)
             else:
                 inst_types = instance_types.get_instance_type(name)
         except exception.DBError, e:
diff --git a/nova/db/api.py b/nova/db/api.py
index 94777f413..add5bd83e 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1118,7 +1118,7 @@ def instance_type_create(context, values):
     return IMPL.instance_type_create(context, values)
 
 
-def instance_type_get_all(context, inactive=0):
+def instance_type_get_all(context, inactive=False):
     """Get all instance types"""
     return IMPL.instance_type_get_all(context, inactive)
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 684574401..3bf4f5eb8 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2342,7 +2342,7 @@ def instance_type_create(_context, values):
 
 
 @require_context
-def instance_type_get_all(context, inactive=0):
+def instance_type_get_all(context, inactive=False):
     """
     Returns a dict describing all instance_types with name as key.
     """
@@ -2353,7 +2353,7 @@ def instance_type_get_all(context, inactive=0):
                         all()
     else:
         inst_types = session.query(models.InstanceTypes).\
-                        filter_by(deleted=inactive).\
+                        filter_by(deleted=False).\
                         order_by("name").\
                         all()
     if inst_types:
@@ -2397,7 +2397,7 @@ def instance_type_destroy(context, name):
     session = get_session()
     instance_type_ref = session.query(models.InstanceTypes).\
                                       filter_by(name=name)
-    records = instance_type_ref.update(dict(deleted=1))
+    records = instance_type_ref.update(dict(deleted=True))
     if records == 0:
         raise exception.NotFound
     else:
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
index 66609054e..5e2cb69d9 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
@@ -55,7 +55,7 @@ def upgrade(migrate_engine):
     try:
         instance_types.create()
     except Exception:
-        logging.info(repr(table))
+        logging.info(repr(instance_types))
         logging.exception('Exception while creating instance_types table')
         raise
 
@@ -72,11 +72,11 @@ def upgrade(migrate_engine):
             # FIXME(kpepple) should we be seeding created_at / updated_at ?
             # now = datetime.datatime.utcnow()
             i.execute({'name': name, 'memory_mb': values["memory_mb"],
-                        'vcpus': values["vcpus"], 'deleted': 0,
+                        'vcpus': values["vcpus"], 'deleted': False,
                         'local_gb': values["local_gb"],
                         'flavorid': values["flavorid"]})
     except Exception:
-        logging.info(repr(table))
+        logging.info(repr(instance_types))
         logging.exception('Exception while seeding instance_types table')
         raise