Repository navigation
Reconcile upstream warm start and routing changes - #446
Merged
Merged
Conversation
(cherry picked from commit fff8227)
(cherry picked from commit eca8acd)
(cherry picked from commit fbd3c84)
(cherry picked from commit 8a77728)
(cherry picked from commit d36e58b)
(cherry picked from commit 45cf5b0)
(cherry picked from commit 31d6954)
(cherry picked from commit 82beba9)
Co-authored-by: hieunt79 <nguyenhieu26496@gmail.com> (cherry picked from commit 7a6d362)
…able (cherry picked from commit 7ea0392)
(cherry picked from commit 9c9adb9)
(cherry picked from commit 6378a85)
(cherry picked from commit 80ef65c)
(cherry picked from commit 8524925)
(cherry picked from commit 67e888b)
(cherry picked from commit 2275552)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Cherry-picks (
-x) the upstream faucetsdn/faucet commits for warm start and routing, plus the upstream FakeOF and test-harness fixes they depend on. Replaces #445.Upstream PRs: faucetsdn#4815 (deleting the final ACL from a port, del_vlan flowdel), faucetsdn#4819 (ACL-only VLAN changes warm start), faucetsdn#4833 (dead static-route nexthops), faucetsdn#4850 (warm start for routed VLANs, with unit and integration tests), faucetsdn#4856 (flush VLAN caches on new dp), faucetsdn#4823 / faucetsdn#4827 / faucetsdn#4828 (FakeOF hashing, masked match, test retry).
Conflicts resolved:
test_valve_config.py: kept thec65ofimport and added upstream'sip_addressimport.mininet_test_base.py(upstream "skip sleeping for the last iteration"): kept the fork's newer load-wait, controller-recreation and liveness logic. Applied upstream's skip-final-sleep to the setup retry loop and towait_nonzero_packet_count_flow.The only differences left from upstream in the touched files are the fork's existing changes: c65of imports,
typevstype_, the sender thread /on_complete, and OVS barriers.Local results: unit tests for valve, valve_config and valve_stack pass (288). black is clean, pylint is ≥ 9.5 per file, and flake8 reports nothing beyond what
mainalready has.🤖 Generated with Claude Code
https://claude.ai/code/session_011y8FLGqKedmbNMnotoUv4g