From 7e0ba8bcdaeb1978cc11d8072a345637a6e44b38 Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Sat, 9 Sep 2023 22:13:40 +0000
Subject: [PATCH] Open the 2024.1 (Caracal) DB branch

According to the TC resolution [1] and the release identification
document [2], the release number will be used as primary identifier in
the development cycle. Release name will be used in marketing.

[1]https://governance.openstack.org/tc/resolutions/20220524-release-identification-process.html
[2]https://governance.openstack.org/tc/reference/release-naming.html

Change-Id: I1ffd5878489176f33146688de03367101ede2305
---
 neutron/db/migration/__init__.py                             | 1 +
 .../2023.2/expand/89c58a70ceba_ecmp_bfd_attributes.py        | 5 +++++
 neutron/db/migration/cli.py                                  | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py
index 00ba4e665a1..8b05fb44cd5 100644
--- a/neutron/db/migration/__init__.py
+++ b/neutron/db/migration/__init__.py
@@ -39,6 +39,7 @@ YOGA = 'yoga'
 ZED = 'zed'
 RELEASE_2023_1 = '2023.1'
 RELEASE_2023_2 = '2023.2'
+RELEASE_2024_1 = '2024.1'
 
 NEUTRON_MILESTONES = [
     # earlier milestones were not tagged
diff --git a/neutron/db/migration/alembic_migrations/versions/2023.2/expand/89c58a70ceba_ecmp_bfd_attributes.py b/neutron/db/migration/alembic_migrations/versions/2023.2/expand/89c58a70ceba_ecmp_bfd_attributes.py
index e4f319b25fb..1de52ab1372 100644
--- a/neutron/db/migration/alembic_migrations/versions/2023.2/expand/89c58a70ceba_ecmp_bfd_attributes.py
+++ b/neutron/db/migration/alembic_migrations/versions/2023.2/expand/89c58a70ceba_ecmp_bfd_attributes.py
@@ -17,6 +17,8 @@ from alembic import op
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+from neutron.db import migration
+
 
 """Add ECMP and BFD router-level policy attributes
 Revision ID: 89c58a70ceba
@@ -29,6 +31,9 @@ Create Date: 2023-02-22 21:08:33.593101
 revision = '89c58a70ceba'
 down_revision = 'c33da356b165'
 
+# milestone identifier, used by neutron-db-manage
+neutron_milestone = [migration.RELEASE_2023_2]
+
 
 def upgrade():
     op.add_column('router_extra_attributes',
diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py
index 32f618b85fb..4f52a551953 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.RELEASE_2023_2
+CURRENT_RELEASE = migration.RELEASE_2024_1
 RELEASES = (
     migration.LIBERTY,
     migration.MITAKA,
@@ -57,6 +57,7 @@ RELEASES = (
     migration.ZED,
     migration.RELEASE_2023_1,
     migration.RELEASE_2023_2,
+    migration.RELEASE_2024_1,
 )
 
 EXPAND_BRANCH = 'expand'