[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202608#415
Merged
Conversation
mssonicbld
commented
Jul 18, 2026
mssonicbld
commented
Collaborator
…on (#4706) ## Summary Split from #4576 per [@deepak-singhal0408's review](sonic-net/sonic-utilities#4576 (comment)) — **Bucket A (bug fix, land immediately)**. `mitigate_installed_not_offloaded_frr_routes()` expects `missed_frr_rt` entries with `prefix` and `protocol` keys, but `fetch_routes()` has been appending bare prefix strings since the ijson refactor (#4205). This causes `TypeError: string indices must be integers` whenever suppress-fib-pending triggers mitigation. Adopts the 202511 approach (#4509): append `{'prefix': prefix, 'protocol': route_entry.get('protocol', '')}` so the mitigation contract is preserved. Keeps the existing ijson JSON parser unchanged. ## Test plan - [ ] `tests/fetch_routes_chunk_test.py` expectations updated for dict format - [ ] CI unit tests pass - [ ] On a device with suppress-fib-pending enabled and stuck routes, mitigation no longer crashes Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
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
1 participant
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.