openstack/nova
Code Issues Proposed changes

Merge "Remove internal_id attribute from instances table"

Browse Source
This commit is contained in:
Jenkins 2016-09-23 21:42:33 +00:00 committed by Gerrit Code Review
commit 15a159b3fc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/db/sqlalchemy/models.py
View File

@ -337,7 +337,12 @@ class Instance(BASE, NovaBase, models.SoftDeleteMixin):
# OpenStack compute cell name. This will only be set at the top of
# the cells tree and it'll be a full cell name such as 'api!hop1!hop2'
cell_name = Column(String(255))
internal_id = Column(Integer)
# NOTE(pumaranikar): internal_id attribute is no longer used (bug 1441242)
# Hence, removing from object layer in current release (Ocata) and will
# treated as deprecated. The column can be removed from schema with
# a migration at the start of next release.
# internal_id = Column(Integer)
# Records whether an instance has been deleted from disk
cleaned = Column(Integer, default=0)

2
nova/tests/unit/db/test_migrations.py
View File

@ -769,7 +769,7 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync,
def removed_column(element):
# Define a whitelist of columns that would be removed from the
# DB at a later release.
column_whitelist = {'instances': ['scheduled_at']}
column_whitelist = {'instances': ['scheduled_at', 'internal_id']}
if element[0] != 'remove_column':
return False