openstack/cinder
Code Issues Proposed changes

Merge "Cleanup DB schema after Mitaka"

Browse Source
This commit is contained in:
Jenkins 2016-04-07 14:34:50 +00:00 committed by Gerrit Code Review
commit 67ceb6aef7
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cinder/db/sqlalchemy/migrate_repo/versions/073_drop_available_versions_and_iscsi_targets.py Normal file
View File

@ -0,0 +1,25 @@
# 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 import MetaData, Table
def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
services = Table('services', meta, autoload=True)
services.c.rpc_available_version.drop()
services.c.object_available_version.drop()
iscsi_targets = Table('iscsi_targets', meta, autoload=True)
iscsi_targets.drop()

4
cinder/db/sqlalchemy/models.py
View File

@ -75,10 +75,6 @@ class Service(BASE, CinderBase):
rpc_current_version = Column(String(36)) rpc_current_version = Column(String(36))
object_current_version = Column(String(36)) object_current_version = Column(String(36))
# FIXME(dulek): In M we've removed rpc_available_version and
# object_available_version from the model. We need to merge a DB migration
# that actually drops these columns from the DB in early Newton.
# replication_status can be: enabled, disabled, not-capable, error, # replication_status can be: enabled, disabled, not-capable, error,
# failed-over or not-configured # failed-over or not-configured
replication_status = Column(String(255), default="not-capable") replication_status = Column(String(255), default="not-capable")

3
cinder/tests/unit/test_migrations.py
View File

@ -110,6 +110,9 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin):
# is performed with the same restrictions as column addition, which # is performed with the same restrictions as column addition, which
# we of course allow. # we of course allow.
66, 66,
# NOTE(dulek): 73 drops tables and columns we've stopped using a
# release ago.
73,
] ]
# NOTE(dulek): We only started requiring things be additive in # NOTE(dulek): We only started requiring things be additive in