Revert "dualtor_neighbor_check.py changed"#4136
Conversation
This reverts commit 7cc435b.
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@zjswhhh for viz |
There was a problem hiding this comment.
Pull request overview
This PR reverts changes from PR #3931 to restore backward compatibility in the dualtor neighbor check functionality. The revert removes the nexthop table querying feature that was previously added, simplifying the neighbor consistency checking logic.
Key changes:
- Removed ASIC nexthop table querying from the Lua script and Python code
- Reverted NEIGHBOR_ATTRIBUTES from 9 to 8 fields (removed "PREFIX_ROUTE" and "NEXTHOP_TYPE", kept "TUNNEL_IN_ASIC")
- Updated test expectations to match the simpler consistency check logic
- Removed two test cases that specifically tested SOC IP neighbor scenarios with nexthop type checking
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| scripts/dualtor_neighbor_check.py | Reverted to simpler neighbor consistency checking without nexthop table queries; removed nexthop-related Lua script code and simplified HWSTATUS logic |
| tests/dualtor_neighbor_check_test.py | Updated all test expectations to match reverted 8-attribute format; removed nexthop table test data and two SOC IP neighbor test cases |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
We should be safe to ignore Pretest Static Analysis errors "E501 line too long (129 > 120 characters)". I will force merge. |
|
Cherry-pick PR to 202511: |
|
@prsunny please help raise pr for 202511 |
|
@manamand2020 , can you please create a PR for 202511? @lolyu for viz |
It seems this change is not present in 202511. |
…t#4136) Reverts sonic-net#3931 Reverting for backward compatibility issues.
Reverts #3931
Reverting for backward compatibility issues.