Merge "Add an index to virtual_interfaces.uuid"
This commit is contained in:
commit
9d91466bcf
|
@ -0,0 +1,54 @@
|
|||
# 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 oslo_log import log as logging
|
||||
from sqlalchemy import MetaData, Table, Index
|
||||
|
||||
from nova.i18n import _LI
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
INDEX_COLUMNS = ['uuid']
|
||||
INDEX_NAME = 'virtual_interfaces_uuid_idx'
|
||||
|
||||
|
||||
def _get_table_index(migrate_engine):
|
||||
meta = MetaData()
|
||||
meta.bind = migrate_engine
|
||||
table = Table('virtual_interfaces', meta, autoload=True)
|
||||
for idx in table.indexes:
|
||||
if idx.columns.keys() == INDEX_COLUMNS:
|
||||
break
|
||||
else:
|
||||
idx = None
|
||||
return meta, table, idx
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta, table, index = _get_table_index(migrate_engine)
|
||||
if index:
|
||||
LOG.info(_LI('Skipped adding %s because an equivalent index'
|
||||
' already exists.'), INDEX_NAME)
|
||||
return
|
||||
columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS]
|
||||
index = Index(INDEX_NAME, *columns)
|
||||
index.create(migrate_engine)
|
||||
|
||||
|
||||
def downgrade(migrate_engine):
|
||||
meta, table, index = _get_table_index(migrate_engine)
|
||||
if not index:
|
||||
LOG.info(_LI('Skipped removing %s because no such index exists'),
|
||||
INDEX_NAME)
|
||||
return
|
||||
index.drop(migrate_engine)
|
|
@ -805,6 +805,7 @@ class VirtualInterface(BASE, NovaBase):
|
|||
name="uniq_virtual_interfaces0address0deleted"),
|
||||
Index('virtual_interfaces_network_id_idx', 'network_id'),
|
||||
Index('virtual_interfaces_instance_uuid_fkey', 'instance_uuid'),
|
||||
Index('virtual_interfaces_uuid_idx', 'uuid'),
|
||||
)
|
||||
id = Column(Integer, primary_key=True, nullable=False)
|
||||
address = Column(String(255))
|
||||
|
|
|
@ -705,6 +705,18 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync,
|
|||
self.assertIsInstance(shadow_services.c.last_seen_up.type,
|
||||
sqlalchemy.types.DateTime)
|
||||
|
||||
def _pre_upgrade_294(self, engine):
|
||||
self.assertIndexNotExists(engine, 'virtual_interfaces',
|
||||
'virtual_interfaces_uuid_idx')
|
||||
|
||||
def _check_295(self, engine, data):
|
||||
self.assertIndexMembers(engine, 'virtual_interfaces',
|
||||
'virtual_interfaces_uuid_idx', ['uuid'])
|
||||
|
||||
def _post_downgrade_295(self, engine):
|
||||
self.assertIndexNotExists(engine, 'virtual_interfaces',
|
||||
'virtual_interfaces_uuid_idx')
|
||||
|
||||
|
||||
class TestNovaMigrationsSQLite(NovaMigrationsCheckers,
|
||||
test_base.DbTestCase,
|
||||
|
|
Loading…
Reference in New Issue