Merge "Support tag instances when boot(1)"

nova/db/sqlalchemy/api_migrations/migrate_repo/versions/042_build_requests_add_tags.py

@@ -0,0 +1,26 @@
+#    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 Column
+from sqlalchemy import MetaData
+from sqlalchemy import Table
+from sqlalchemy import Text
+
+
+def upgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    build_requests = Table('build_requests', meta, autoload=True)
+
+    if not hasattr(build_requests.c, 'tags'):
+        build_requests.create_column(Column('tags', Text()))

nova/db/sqlalchemy/api_models.py

@@ -243,6 +243,7 @@ class BuildRequest(API_BASE):
     project_id = Column(String(255), nullable=False)
     instance = Column(MediumText())
     block_device_mappings = Column(MediumText())
+    tags = Column(Text())
     # TODO(alaski): Drop these from the db in Ocata
     # columns_to_drop = ['request_spec_id', 'user_id', 'display_name',
     #         'instance_metadata', 'progress', 'vm_state', 'task_state',

nova/tests/functional/db/api/test_migrations.py

@@ -605,6 +605,9 @@ class NovaAPIMigrationsWalk(test_migrations.WalkVersionsMixin):
                 self.assertEqual(['resource_provider_id'],
                                  fk['constrained_columns'])
 
+    def _check_042(self, engine, data):
+        self.assertColumnExists(engine, 'build_requests', 'tags')
+
 
 class TestNovaAPIMigrationsWalkSQLite(NovaAPIMigrationsWalk,
                                       test_base.DbTestCase,