commit 618e8588b3ed3c4aa21a2cd9701bc09434c6ccf1 Author: Rodolfo Alonso Hernandez Date: Wed Sep 30 13:14:22 2020 +0000 Open Wallaby DB branch Change-Id: I50cb2424b55a53f675cb3fa128cbe36b9adbba6d diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index e418604..cc76d00 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -34,6 +34,7 @@ STEIN = 'stein' TRAIN = 'train' USSURI = 'ussuri' VICTORIA = 'victoria' +WALLABY = 'wallaby' NEUTRON_MILESTONES = [ # earlier milestones were not tagged @@ -47,6 +48,7 @@ NEUTRON_MILESTONES = [ STEIN, TRAIN, USSURI, + VICTORIA, # Do not add the milestone until the end of the release ] diff --git a/neutron/db/migration/alembic_migrations/versions/victoria/expand/I38991de2b4_source_and_destination_ip_prefix_neutron_metering_rule.py b/neutron/db/migration/alembic_migrations/versions/victoria/expand/I38991de2b4_source_and_destination_ip_prefix_neutron_metering_rule.py index a39429b..2f6c29d 100644 --- a/neutron/db/migration/alembic_migrations/versions/victoria/expand/I38991de2b4_source_and_destination_ip_prefix_neutron_metering_rule.py +++ b/neutron/db/migration/alembic_migrations/versions/victoria/expand/I38991de2b4_source_and_destination_ip_prefix_neutron_metering_rule.py @@ -14,9 +14,10 @@ # from alembic import op - import sqlalchemy as sa +from neutron.db import migration + """Add source and destination IP prefixes to neutron metering system Revision ID: I38991de2b4 Revises: fd6107509ccd @@ -28,6 +29,9 @@ Create Date: 2020-08-20 10:00:00.000000 revision = 'I38991de2b4' down_revision = '49d8622c5221' +# milestone identifier, used by neutron-db-manage +neutron_milestone = [migration.VICTORIA] + metering_label_rules_table_name = 'meteringlabelrules' diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index c1b49c7..ffe2a5f 100644 --- a/neutron/db/migration/cli.py +++ b/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.VICTORIA +CURRENT_RELEASE = migration.WALLABY RELEASES = ( migration.LIBERTY, migration.MITAKA, @@ -50,6 +50,7 @@ RELEASES = ( migration.TRAIN, migration.USSURI, migration.VICTORIA, + migration.WALLABY, ) EXPAND_BRANCH = 'expand'