Merge "Open Zed DB branch"

neutron/db/migration/__init__.py

@@ -36,6 +36,7 @@ VICTORIA = 'victoria'
 WALLABY = 'wallaby'
 XENA = 'xena'
 YOGA = 'yoga'
+ZED = 'zed'
 
 NEUTRON_MILESTONES = [
     # earlier milestones were not tagged
@@ -52,6 +53,7 @@ NEUTRON_MILESTONES = [
     VICTORIA,
     WALLABY,
     XENA,
+    YOGA,
     # Do not add the milestone until the end of the release
 ]
 

neutron/db/migration/alembic_migrations/versions/yoga/expand/34cf8b009713_add_router_ndp_proxy_table.py

@@ -18,6 +18,7 @@ import sqlalchemy as sa
 
 from neutron_lib.db import constants
 
+from neutron.db import migration
 
 """add router ndp proxy table
 
@@ -31,6 +32,9 @@ Create Date: 2021-12-03 03:57:34.838905
 revision = '34cf8b009713'
 down_revision = 'cd9ef14ccf87'
 
+# milestone identifier, used by neutron-db-manage
+neutron_milestone = [migration.YOGA]
+
 
 def upgrade():
     op.create_table(

neutron/db/migration/cli.py

@@ -37,7 +37,7 @@ HEADS_FILENAME = 'HEADS'
 CONTRACT_HEAD_FILENAME = 'CONTRACT_HEAD'
 EXPAND_HEAD_FILENAME = 'EXPAND_HEAD'
 
-CURRENT_RELEASE = migration.YOGA
+CURRENT_RELEASE = migration.ZED
 RELEASES = (
     migration.LIBERTY,
     migration.MITAKA,
@@ -53,6 +53,7 @@ RELEASES = (
     migration.WALLABY,
     migration.XENA,
     migration.YOGA,
+    migration.ZED,
 )
 
 EXPAND_BRANCH = 'expand'