Make resource ids UUIDs in the database

Change-Id: I3068e9e818f19994cc3aaecc34845d0d6aac0dfb

diff --git a/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py
new file mode 100644 (file)
index 0000000..dcf1cf5
--- /dev/null
+++ b/heat/db/sqlalchemy/migrate_repo/versions/018_resource_id_uuid.py
@@ -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)

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 0812ca1c8a83fcea3a175950882b05acc4fd76c5..cda85c36693a77b32f95f62a4fbb85371a21818d 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -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)