From 518b623d7eaab119cfef80cac3cef25ba54d7fef Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Tue, 28 Apr 2020 09:00:42 +0000 Subject: [PATCH] Open Victoria DB branch Change-Id: I27d7f393d7ef9383ed3cb0e4338cbb6d767721d9 --- neutron/db/migration/__init__.py | 2 ++ .../ussuri/expand/d8bdf05313f4_add_in_use_to_subnet.py | 5 +++++ neutron/db/migration/cli.py | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index e11f006ab10..e4186044476 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -33,6 +33,7 @@ ROCKY = 'rocky' STEIN = 'stein' TRAIN = 'train' USSURI = 'ussuri' +VICTORIA = 'victoria' NEUTRON_MILESTONES = [ # earlier milestones were not tagged @@ -45,6 +46,7 @@ NEUTRON_MILESTONES = [ ROCKY, STEIN, TRAIN, + USSURI, # Do not add the milestone until the end of the release ] diff --git a/neutron/db/migration/alembic_migrations/versions/ussuri/expand/d8bdf05313f4_add_in_use_to_subnet.py b/neutron/db/migration/alembic_migrations/versions/ussuri/expand/d8bdf05313f4_add_in_use_to_subnet.py index 2fa0c22211f..0838f9ab02e 100644 --- a/neutron/db/migration/alembic_migrations/versions/ussuri/expand/d8bdf05313f4_add_in_use_to_subnet.py +++ b/neutron/db/migration/alembic_migrations/versions/ussuri/expand/d8bdf05313f4_add_in_use_to_subnet.py @@ -17,6 +17,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.engine import reflection +from neutron.db import migration + """add in_use to subnet @@ -30,6 +32,9 @@ Create Date: 2020-03-13 17:15:38.462751 revision = 'd8bdf05313f4' down_revision = 'e88badaa9591' +# milestone identifier, used by neutron-db-manage +neutron_milestone = [migration.USSURI] + TABLE = 'subnets' COLUMN_IN_USE = 'in_use' diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index 63ae736159b..b5657ae6442 100644 --- a/neutron/db/migration/cli.py +++ b/neutron/db/migration/cli.py @@ -38,7 +38,7 @@ HEADS_FILENAME = 'HEADS' CONTRACT_HEAD_FILENAME = 'CONTRACT_HEAD' EXPAND_HEAD_FILENAME = 'EXPAND_HEAD' -CURRENT_RELEASE = migration.USSURI +CURRENT_RELEASE = migration.VICTORIA RELEASES = ( migration.LIBERTY, migration.MITAKA, @@ -50,6 +50,7 @@ RELEASES = ( migration.STEIN, migration.TRAIN, migration.USSURI, + migration.VICTORIA, ) EXPAND_BRANCH = 'expand'