summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-06-17 14:48:58 +0000
committerRick Harris <rick.harris@rackspace.com>2011-06-17 14:48:58 +0000
commit1d815c177df76eb4f497a67fbdbd58fb170ca880 (patch)
tree5aa151177e2bed5155e11fcb96b118d4320d26b1
parentf96eb29e8fca5781bdbcc70e66c48c457ce09601 (diff)
downloadnova-1d815c177df76eb4f497a67fbdbd58fb170ca880.tar.gz
nova-1d815c177df76eb4f497a67fbdbd58fb170ca880.tar.xz
nova-1d815c177df76eb4f497a67fbdbd58fb170ca880.zip
Fixed migration per review feedback.
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/024_add_uuid_to_instances.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/024_add_uuid_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/024_add_uuid_to_instances.py
index ae8a83200..27f30d536 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/024_add_uuid_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/024_add_uuid_to_instances.py
@@ -14,10 +14,10 @@
# License for the specific language governing permissions and limitations
# under the License.
-import uuid
-
from sqlalchemy import Column, Integer, MetaData, String, Table
+from nova import utils
+
meta = MetaData()
@@ -32,8 +32,10 @@ def upgrade(migrate_engine):
rows = migrate_engine.execute(instances.select())
for row in rows:
- instance_uuid = uuid.uuid4()
- migrate_engine.execute(instances.update().values(uuid=instance_uuid))
+ instance_uuid = str(utils.gen_uuid())
+ migrate_engine.execute(instances.update()\
+ .where(instances.c.id == row[0])\
+ .values(uuid=instance_uuid))
def downgrade(migrate_engine):