Merge "Add default column to ConductorHardwareInterfaces"

ironic/db/sqlalchemy/alembic/versions/dbefd6bdaa2c_add_default_column_to_.py

@@ -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))

ironic/db/sqlalchemy/models.py

@@ -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):

ironic/tests/unit/db/sqlalchemy/test_migrations.py

@@ -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')