diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-28 01:54:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-28 01:54:15 +0000 |
| commit | f86f9a8cb508da22bf02ac602710bacd8e2c1ff2 (patch) | |
| tree | f3802ffdedb3c5c67eda9a81fc7224a14bc83910 | |
| parent | 6d9bbb17b7685830e2c497d5aac778b2f69d7c94 (diff) | |
| parent | 09a3566a46bf2d19bc30065f31a2cc3ad15a33b1 (diff) | |
| download | nova-f86f9a8cb508da22bf02ac602710bacd8e2c1ff2.tar.gz nova-f86f9a8cb508da22bf02ac602710bacd8e2c1ff2.tar.xz nova-f86f9a8cb508da22bf02ac602710bacd8e2c1ff2.zip | |
Merge "BM Migration 004: Actually drop column"
| -rw-r--r-- | nova/tests/test_migrations.py | 4 | ||||
| -rw-r--r-- | nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index d359cbdb5..ebccb84df 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -1023,3 +1023,7 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn): def _check_002(self, engine, data): self.assertRaises(sqlalchemy.exc.NoSuchTableError, get_table, engine, 'bm_deployments') + + def _post_downgrade_004(self, engine): + bm_nodes = get_table(engine, 'bm_nodes') + self.assertNotIn(u'instance_name', [c.name for c in bm_nodes.columns]) diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py index 68fbe0960..6f85b9cec 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py @@ -32,6 +32,4 @@ def downgrade(migrate_engine): meta.bind = migrate_engine t = Table('bm_nodes', meta, autoload=True) - name_col = Column('instance_name', String(length=255)) - - t.drop_column(name_col) + t.drop_column('instance_name') |