From 7b5464e5a8e9d653b4a81fbde16127406f3b8beb Mon Sep 17 00:00:00 2001
From: Koichiro Den <den@valinux.co.jp>
Date: Tue, 10 Nov 2020 22:58:52 +0900
Subject: [PATCH] Fix the alembic migration for vnf_software_images column
 types

Change 731636 [1] was merged without merging the alembic branches nor
updating the source revision. Precisely speaking, when the Patch Set
12 for Change 731636 [1] was rebased to the master branch, the source
code gets to contain the migration file for Change 756703 [2], though
no proper fix has been done. Afterwards the migration "alter min_ram,
min_disk columns of vnf_software_images" becomes ignored.

[1]: https://review.opendev.org/#/c/731636
[2]: https://review.opendev.org/#/c/756703/

Change-Id: Ibf71848d0feca6e0c5c244fbc20d3b6d007d45b3
---
 .../versions/329cd1619d41_alter_vnf_software_images.py        | 4 ++--
 tacker/db/migration/alembic_migrations/versions/HEAD          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tacker/db/migration/alembic_migrations/versions/329cd1619d41_alter_vnf_software_images.py b/tacker/db/migration/alembic_migrations/versions/329cd1619d41_alter_vnf_software_images.py
index 00e11a0e4..53b1e1e14 100644
--- a/tacker/db/migration/alembic_migrations/versions/329cd1619d41_alter_vnf_software_images.py
+++ b/tacker/db/migration/alembic_migrations/versions/329cd1619d41_alter_vnf_software_images.py
@@ -16,7 +16,7 @@
 """alter min_ram, min_disk columns of vnf_software_images
 
 Revision ID: 329cd1619d41
-Revises: d2e39e01d540
+Revises: d25c7c865ce8
 Create Date: 2020-05-28 03:54:52.871841
 
 """
@@ -26,7 +26,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '329cd1619d41'
-down_revision = '329cd1619d41'
+down_revision = 'd25c7c865ce8'
 
 
 def upgrade(active_plugins=None, options=None):
diff --git a/tacker/db/migration/alembic_migrations/versions/HEAD b/tacker/db/migration/alembic_migrations/versions/HEAD
index 506f664be..f1c330124 100644
--- a/tacker/db/migration/alembic_migrations/versions/HEAD
+++ b/tacker/db/migration/alembic_migrations/versions/HEAD
@@ -1 +1 @@
-d25c7c865ce8
+329cd1619d41