Synchronise 2025.1 with upstream #243
Open
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
In the functional tests, the OVN databases are created per test and removed at the end. That leaves no trace the local OVN databases if running in a system running OpenStack. But the OVS database is global and shared with all the tests and running processes. It is needed to use the OVS IDL ``api_factory`` method that returns a global object for all tests. Closes-Bug: #2119453 Signed-off-by: Rodolfo Alonso Hernandez <[email protected]> Change-Id: I7b438ba76e6f95d533d8d7bc4aaeeba0007551e3 (cherry picked from commit 23994f6)
If there are two (or more) security group rules that have the same normalized cidr, only one of them will match the OVN ACL exactly. The other will match everything except the rule ID. Go through any items found a second time, ignoring the rule ID to remove the false-positives. Closes-bug: #2087822 Change-Id: Ia5a76973f80be1369753ebf42fba2fc19690a229 Signed-off-by: Brian Haley <[email protected]> (cherry picked from commit 1c3eac5)
The ``OVNAgentExtensionAPI`` and ``OVNAgentExtensionManager`` instances create different threads instances. Now the OVN agent is using the ``oslo.service`` threading implementation (that uses ``cotyledon``). This library creates a fork of the main process to execute the ``ServiceWrapper`` instance, where the agent is running. Any thread should be created in the child process, at the ``oslo_service.service.Service.start`` method. Closes-Bug: #2131540 Signed-off-by: Rodolfo Alonso Hernandez <[email protected]> Change-Id: I97d52e8fd2236b7d9210174d05f01c81a2edcd0d (cherry picked from commit 5e92bbf)
Previously, OVN logapi driver only considered that Port Groups and ACLs were created by Security Groups. This is not true, since the FWaaS plugin does also manage ACLs and Port Groups to apply its rules. This means that port groups do not necessarily need to have a security group ID referenced on their external IDs. Closes-Bug: #2131209 Change-Id: I7f85077ce344d4d0e46190674fc79c42a9eeae9a Signed-off-by: Elvira Garcia <[email protected]> (cherry picked from commit c0f6145)
Closes-Bug: 2130972 Change-Id: I662b3eb7fb8c17d0ad30b10e8537d4a142003256 Signed-off-by: Sergey Kraynev <[email protected]> (cherry picked from commit d95e3e5)
Closes-Bug: #2132982 Signed-off-by: Rodolfo Alonso Hernandez <[email protected]> Change-Id: I86ed1aa473a41ece4478e19b1e0f37aadaf93238 (cherry picked from commit 45b8dfe)
String contained %s but had no argument, added port id. Closes-bug: #2132088 Change-Id: I36d3c036c9795603d93b01bfd94d2ae80dc2ec7b Signed-off-by: Brian Haley <[email protected]> (cherry picked from commit 807e6a5)
webob does not automatically detect and add content-encoding header if body is compressed. Instead, this header needs to be passed to webob.Response as a headerlist argument. Only in this case `decode_content()` performs decompression. However, Nova does not add 'content-encoding' in response, and even if it would - only selected headers are currenly consumed by agent. Thus, we generalize approach for handling headers and ensure that 'content-encoding' is present in case we detect magic file signature at the beginning of data. Closes-Bug: #2120723 Change-Id: I45d99e2bae3768f2258f39c9b92e7c2cbd080e7c Signed-off-by: Dmitriy Rabotyagov <[email protected]> (cherry picked from commit 67969c1)
Previously with [1] we blocked possiblility to set as allowed address pair for port any IP or CIDR which contains IP address assigned to the distributed metadata IP address in same network. It was done that way because setting distributed metadata IP address as allowed address pair for any port in the network breaks metadata service for all of the ports in that network. But this restriction was too strict as it also prevented to set CIDRs bigger then /32 or /128 in the allowed_address_pair if CIDR contained distributed metadata port IP. For example: - distributed metadata port IP address 10.0.0.2 - allowed address pairs set for port in that network: - 10.0.0.3 - allowed - 10.0.0.1/26 - not allowed as 10.0.0.2 belongs to that CIDR. In such case however, when CIDR is set as allowed_address_pair, it is not set in OVN as Virtual IP so it won't break connectivity to the metadata service as was reported in [2] thus we should allow that. This patch is reducing that restriction. Now CIDRs can be set as allowed_address_pair for the port even if it includes IP assigned for the distributed metadata port. It is only forbidden to set as allowed_address_pair same, single IP address as set for the distributed metadata port. Closes-Bug: #2131928 [1] https://review.opendev.org/c/openstack/neutron/+/955757 [2] https://bugs.launchpad.net/neutron/+bug/2116249 Change-Id: Ieb98a126b6d380894456ed892c0a19787e7fbb04 Signed-off-by: Slawek Kaplonski <[email protected]> (cherry picked from commit 71ae26e)
This patch reuses the `WaitEvent` created in [1], to check that the expected `Manager` register is created before checking it. [1]https://review.opendev.org/c/openstack/neutron/+/966673 Related-Bug: #2131024 Signed-off-by: Rodolfo Alonso Hernandez <[email protected]> Change-Id: I0b6568ca6c3844bd32892a2ebb8c36e1fec144c9 (cherry picked from commit 31b78bf)
github-actions
bot
added
automated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.