Synchronise 2025.1 with upstream #231
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
The class ``MetadataProxyHandlerBaseSocketServer`` is implemented only
once in ``neutron.common.metadata``.
Conflicts:
neutron/agent/metadata/agent.py
Partial-Bug: #2100585
Change-Id: I17f80ec62398eeb0135a7ab2ff59aa692d2fa086
(cherry picked from commit af3cab0)
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
In the test ``TestOVNTrunkDriver.test_subport_delete``, a new wait event is added. Before removing the subport from the trunk, the test checks that the OVN NB database has correctly stored the device owner in the external_ids dictionary. More information in [1]. [1]https://bugs.launchpad.net/neutron/+bug/2117405/comments/2 Closes-Bug: #2117405 Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com> Change-Id: I3aa677c1e75415d3ad2ca77ef578494526a44969 (cherry picked from commit fc2a53c)
When a trunk subport is created and assigned to a trunk, a "Port_Binding" register is created. If the subport is then deleted from the trunk, this "Port_Binding" register is deleted. This patch, before removing the subport from the trunk, adds a check for this "Port_Binding" register creation. Closes-Bug: #2117405 Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com> Change-Id: I68a8c972ed88e4c62dc4de59fe3904cb85278b1c (cherry picked from commit 40692e9)
The metadata server response can be encoded. The metadata proxy decodes it before crafting the HTTP message that will be delivered to the virtual machine. It requires that the HTTP message sent by the metadata server contains the proper "Context-Encoding" header, defining the encoding type used. This header is not provided by default (the content is not encoded) or is empty. NOTE: unless we provide a method to encode the Nova metadata server content, it would not be possible to properly test this patch. Closes-Bug: #2120723 Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com> Change-Id: I747872f031cc5a1a87ced69bb0af645c088143f3 (cherry picked from commit c031b59)
github-actions
bot
added
automated
priteau
approved these changes
Sep 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2025.1 from upstream stable/2025.1.