From 88cf1ea287f4ac838d57581a2f0283b2ff52a417 Mon Sep 17 00:00:00 2001 From: Tim Simpson Date: Sun, 10 Jun 2012 18:58:55 -0500 Subject: [PATCH] Reverting migration 007 to as it was and creating 008. --- .../versions/007_add_volume_flavor.py | 43 +++++++++++++++++++ ...e_fields.py => 008_add_instance_fields.py} | 4 -- 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py rename reddwarf/db/sqlalchemy/migrate_repo/versions/{007_add_instance_fields.py => 008_add_instance_fields.py} (86%) diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py new file mode 100644 index 0000000000..84676ae69a --- /dev/null +++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_volume_flavor.py @@ -0,0 +1,43 @@ +# Copyright 2012 OpenStack LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from sqlalchemy.schema import Column +from sqlalchemy.schema import MetaData + +from reddwarf.db.sqlalchemy.migrate_repo.schema import String +from reddwarf.db.sqlalchemy.migrate_repo.schema import Table + + +def upgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + # add column: + instances = Table('instances', meta, autoload=True) + volume_size = Column('volume_size', String(36)) + flavor_id = Column('flavor_id', String(36)) + + instances.create_column(flavor_id) + instances.create_column(volume_size) + + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + # drop column: + instances = Table('instances', meta, autoload=True) + + instances.drop_column('flavor_id') + instances.drop_column('volume_size') diff --git a/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_instance_fields.py b/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py similarity index 86% rename from reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_instance_fields.py rename to reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py index 73624d0731..037292b372 100644 --- a/reddwarf/db/sqlalchemy/migrate_repo/versions/007_add_instance_fields.py +++ b/reddwarf/db/sqlalchemy/migrate_repo/versions/008_add_instance_fields.py @@ -27,8 +27,6 @@ def upgrade(migrate_engine): # add column: instances = Table('instances', meta, autoload=True) - instances.create_column(Column('flavor_id', String(36), nullable=True)) - instances.create_column(Column('volume_size', Integer(), nullable=True)) instances.create_column(Column('tenant_id', String(36), nullable=True)) instances.create_column(Column('server_status', String(64))) @@ -40,7 +38,5 @@ def downgrade(migrate_engine): # drop column: instances = Table('instances', meta, autoload=True) - instances.drop_column('flavor_id') - instances.drop_column('volume_size') instances.drop_column('tenant_id') instances.drop_column('server_status')