summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorKen Pepple <ken.pepple@gmail.com>2011-02-05 18:23:01 -0800
committerKen Pepple <ken.pepple@gmail.com>2011-02-05 18:23:01 -0800
commit5cd5d4e9682848cba60a8dec352fe0f74aaa9eac (patch)
treea7b1cf16055e0a59c74b87859e30302d47640f34 /nova/db
parentfcd0a7b245470054718c94adf0da6a528a01f173 (diff)
downloadnova-5cd5d4e9682848cba60a8dec352fe0f74aaa9eac.tar.gz
nova-5cd5d4e9682848cba60a8dec352fe0f74aaa9eac.tar.xz
nova-5cd5d4e9682848cba60a8dec352fe0f74aaa9eac.zip
flavorid and name need to be unique in the database for the ec2 and openstack apis, repectively
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py b/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
index c5ae9ea72..f95996042 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/003_cactus.py
@@ -34,12 +34,13 @@ instance_types = Table('instance_types', meta,
Column('deleted', Boolean(create_constraint=True, name=None)),
Column('name',
String(length=255, convert_unicode=False, assert_unicode=None,
- unicode_error=None, _warn_on_bytestring=False)),
+ unicode_error=None, _warn_on_bytestring=False),
+ unique=True),
Column('id', Integer(), primary_key=True, nullable=False),
Column('memory_mb', Integer(), nullable=False),
Column('vcpus', Integer(), nullable=False),
Column('local_gb', Integer(), nullable=False),
- Column('flavorid', Integer(), nullable=False),
+ Column('flavorid', Integer(), nullable=False, unique=True),
)