Synchronise yoga with upstream #60
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 tunneling bridge uses different openflow rules depending if the agent is running in DVR mode or not. With DVR enabled initial rule was installed that caused traffic coming from the integration bridge to be flooded to all tunnels. After a few miliseconds this flow was replaced by a DVR specific flow, correctly dropping the traffic. This small time window caused a network loop on the compute node with restarted agent. This patch skips installing the non-dvr specific flow in case OVS agent is working in DVR mode. Hence the traffic is never flooded to the tunnels. Closes-bug: #2028795 Conflicts: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py Signed-off-by: Jakub Libosvar <libosvar@redhat.com> Change-Id: I3ce026054286c8e28ec1500f1a4aa607fe73f337 (cherry picked from commit ba6f7bf)
In the test_port_deletion_prevention_handles_missing_port test which is part of the classes: * neutron.tests.unit.extensions.test_l3.L3NatDBSepTestCase * neutron.tests.unit.extensions.test_extraroute.ExtraRouteDBSepTestCase it is needed to call pecan application to e.g. create network to make all models to be ready. Otherwise things like port_forwarding attribute in the Port class, which is loaded in lazy mode isn't available and test was failing when was run in the isolated environment. It wasn't failing in the gate as there were other tests run by the same worker before this one and then it was all initialized properly. Closes-Bug: #2028285 Change-Id: Ie2382540d7c0a8813f093ddf51d82fe530026d71 (cherry picked from commit 14b2f4f)
github-actions
bot
added
automated
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 yoga from upstream.