Merge "Open Xena DB branch"

neutron/db/migration/__init__.py

@@ -35,6 +35,7 @@ TRAIN = 'train'
 USSURI = 'ussuri'
 VICTORIA = 'victoria'
 WALLABY = 'wallaby'
+XENA = 'xena'
 
 NEUTRON_MILESTONES = [
     # earlier milestones were not tagged
@@ -49,6 +50,7 @@ NEUTRON_MILESTONES = [
     TRAIN,
     USSURI,
     VICTORIA,
+    WALLABY,
     # Do not add the milestone until the end of the release
 ]
 

neutron/db/migration/alembic_migrations/versions/wallaby/expand/6135a7bd4425_add_rbac_support_for_address_group.py

@@ -14,6 +14,7 @@
 from alembic import op
 import sqlalchemy as sa
 
+from neutron.db import migration
 
 """add_rbac_support_for_address_group
 
@@ -27,6 +28,9 @@ Create Date: 2021-01-22 11:24:07.435031
 revision = '6135a7bd4425'
 down_revision = '1e0744e4ffea'
 
+# milestone identifier, used by neutron-db-manage
+neutron_milestone = [migration.WALLABY]
+
 
 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.WALLABY
+CURRENT_RELEASE = migration.XENA
 RELEASES = (
     migration.LIBERTY,
     migration.MITAKA,
@@ -51,6 +51,7 @@ RELEASES = (
     migration.USSURI,
     migration.VICTORIA,
     migration.WALLABY,
+    migration.XENA,
 )
 
 EXPAND_BRANCH = 'expand'