From: Zane Bitter <zbitter@redhat.com>
Date: Thu, 13 Jun 2013 18:03:26 +0000 (+0200)
Subject: Make resource ids UUIDs in the database
X-Git-Tag: 2014.1~488^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=36283537e00d7561278f78b467b98832903f2d08;p=openstack-build%2Fheat-build.git

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
index 00000000..dcf1cf5b
--- /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 0812ca1c..cda85c36 100644
--- 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)