Reverting migration 007 to as it was and creating 008.

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')

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')