Skip to content

Synchronise 2025.1 with upstream#266

Merged
priteau merged 2 commits intostackhpc/2025.1from
upstream/2025.1-2026-03-16
Mar 23, 2026
Merged

Synchronise 2025.1 with upstream#266
priteau merged 2 commits intostackhpc/2025.1from
upstream/2025.1-2026-03-16

Conversation

@github-actions
Copy link
Copy Markdown

This PR contains a snapshot of 2025.1 from upstream stable/2025.1.

ralonsoh and others added 2 commits February 21, 2026 15:17
This patch adds an OVN maintenance method to create the corresponding
``Address_Set`` for each Neutron Address Group, and create its own
OVN revision number. That is needed for Address Groups before [1].

This patch also updates the current ``ACL`` to add the ``Address_Set``
for these ones created before the related patch.

[1]https://review.opendev.org/c/openstack/neutron/+/949854

Conflicts:
  neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py
  neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_impl_idl.py
  neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py

Closes-Bug: #2141589

Assisted-By: claude-4.6-opus-high
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: I74176f8d53d080fcada418d481e9a8f4a32db744
(cherry picked from commit fe47ec9)
@github-actions github-actions Bot requested a review from a team as a code owner March 16, 2026 06:47
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Mar 16, 2026
@priteau priteau merged commit 877847b into stackhpc/2025.1 Mar 23, 2026
1 check failed
@priteau priteau deleted the upstream/2025.1-2026-03-16 branch March 23, 2026 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants