Merge "db: Add attachment_id to block_device_mapping"

2 files changed, 30 insertions, 0 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/358_bdm_attachment_id.py b/nova/db/sqlalchemy/migrate_repo/versions/358_bdm_attachment_id.py
new file mode 100644
index 0000000000..da0f465838
--- /dev/null
+++ b/nova/db/sqlalchemy/migrate_repo/versions/358_bdm_attachment_id.py
@@ -0,0 +1,28 @@
+#    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 String
+from sqlalchemy import Table
+
+
+def upgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    for prefix in ('', 'shadow_'):
+        table = Table(prefix + 'block_device_mapping', meta, autoload=True)
+        new_column = Column('attachment_id', String(36), nullable=True)
+        if not hasattr(table.c, 'attachment_id'):
+            table.create_column(new_column)
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 90b63a9b76..776b2fdf15 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -623,6 +623,8 @@ class BlockDeviceMapping(BASE, NovaBase, models.SoftDeleteMixin):
 
     tag = Column(String(255))
 
+    attachment_id = Column(String(36))
+
 
 class SecurityGroupInstanceAssociation(BASE, NovaBase, models.SoftDeleteMixin):
     __tablename__ = 'security_group_instance_association'