Add default column to ConductorHardwareInterfaces

This will mark the default interface for each hardware type in use.
This is the only piece of information about hardware interfaces that is
not in the database, and so this will allow the API to fetch this
information without an RPC call.

Change-Id: I5b05853a64ebb2744f9dc87855fb31fbe5cefce6
Partial-Bug: #1524745
This commit is contained in:
Jim Rollenhagen 2017-01-17 15:55:28 +00:00
parent 713a440884
commit ac90e7372c
3 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,35 @@
# All Rights Reserved.
#
# 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.
"""Add default column to ConductorHardwareInterfaces
Revision ID: dbefd6bdaa2c
Revises: 2353895ecfae
Create Date: 2017-01-17 15:28:04.653738
"""
# revision identifiers, used by Alembic.
revision = 'dbefd6bdaa2c'
down_revision = '2353895ecfae'
from alembic import op
import sqlalchemy as sa
def upgrade():
op.add_column('conductor_hardware_interfaces', sa.Column('default',
sa.Boolean,
nullable=False,
default=False))

View File

@ -105,6 +105,7 @@ class ConductorHardwareInterfaces(Base):
hardware_type = Column(String(255), nullable=False)
interface_type = Column(String(16), nullable=False)
interface_name = Column(String(255), nullable=False)
default = Column(Boolean, default=False, nullable=False)
class Node(Base):

View File

@ -652,6 +652,14 @@ class MigrationCheckersMixin(object):
self.assertIsInstance(ifaces.c.interface_name.type,
sqlalchemy.types.String)
def _check_dbefd6bdaa2c(self, engine, data):
ifaces = db_utils.get_table(engine, 'conductor_hardware_interfaces')
col_names = [column.name for column in ifaces.c]
self.assertIn('default', col_names)
self.assertIsInstance(ifaces.c.default.type,
(sqlalchemy.types.Boolean,
sqlalchemy.types.Integer))
def test_upgrade_and_version(self):
with patch_with_engine(self.engine):
self.migration_api.upgrade('head')