openstack
/
heat
Code Issues Proposed changes

Merge "Make resource ids UUIDs in the database"

This commit is contained in:
Jenkins 2013-06-14 09:59:13 +00:00 committed by Gerrit Code Review
parent 440ada0c61 36283537e0
commit f207ad06b8
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py Normal file
View File

@ -0,0 +1,19 @@
import sqlalchemy
from heat.openstack.common import uuidutils
def upgrade(migrate_engine):
meta = sqlalchemy.MetaData(bind=migrate_engine)
resource = sqlalchemy.Table('resource', meta, autoload=True)
resource.c.id.alter(sqlalchemy.String(36), primary_key=True,
default=uuidutils.generate_uuid)
def downgrade(migrate_engine):
meta = sqlalchemy.MetaData(bind=migrate_engine)
resource = sqlalchemy.Table('resource', meta, autoload=True)
resource.c.id.alter(sqlalchemy.Integer, primary_key=True)

2
heat/db/sqlalchemy/models.py
View File

@ -211,7 +211,7 @@ class Resource(BASE, HeatBase):
__tablename__ = 'resource'
id = Column(Integer, primary_key=True)
id = Column(String, primary_key=True, default=uuidutils.generate_uuid)
state = Column('state', String)
name = Column('name', String, nullable=False)
nova_instance = Column('nova_instance', String)