Merge "Open Yoga DB branch"

neutron/db/migration/__init__.py

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

neutron/db/migration/alembic_migrations/versions/xena/expand/1bb3393de75d_add_qos_pps_rule.py

@@ -27,10 +27,15 @@ import sqlalchemy as sa
 
 from neutron_lib import constants
 
+from neutron.db import migration
+
 # revision identifiers, used by Alembic.
 revision = '1bb3393de75d'
 down_revision = '8df53b0d2c0e'
 
+# milestone identifier, used by neutron-db-manage
+neutron_milestone = [migration.XENA]
+
 direction_enum = sa.Enum(
     constants.EGRESS_DIRECTION, constants.INGRESS_DIRECTION,
     name='qos_packet_rate_limit_rules_directions'

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.XENA
+CURRENT_RELEASE = migration.YOGA
 RELEASES = (
     migration.LIBERTY,
     migration.MITAKA,
@@ -52,6 +52,7 @@ RELEASES = (
     migration.VICTORIA,
     migration.WALLABY,
     migration.XENA,
+    migration.YOGA,
 )
 
 EXPAND_BRANCH = 'expand'