[202512] Fix ft2 upstream neighbor map to use lt2 instead of ut2 (#24187)#1175
Open
bingwang-ms wants to merge 1 commit into
Open
[202512] Fix ft2 upstream neighbor map to use lt2 instead of ut2 (#24187)#1175bingwang-ms wants to merge 1 commit into
bingwang-ms wants to merge 1 commit into
Conversation
…187) Cherry-pick of PR #24187: Fix 'ft2' entry in UPSTREAM_ALL_NEIGHBOR_MAP from ['ut2'] to ['lt2']. The ft2 topology connects to lt2 (leaf tier 2) upstream neighbors, not ut2. The incorrect mapping caused ntp/test_ntp.py and route/test_default_route.py to fail on ft2 testbeds. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Bing Wang <bingwang@microsoft.com>
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.
Description of PR
Summary:
Cherry-pick of sonic-net/sonic-mgmt#24187 to 202512 branch.
Fix
ft2entry inUPSTREAM_ALL_NEIGHBOR_MAPfrom['ut2']to['lt2'].The
ft2topology connects tolt2(leaf tier 2) upstream neighbors, notut2. The incorrect mapping causedntp/test_ntp.pyandroute/test_default_route.pyto fail on ft2 testbeds because they could not find the correct upstream neighbor.Type of change
Approach
What is the motivation for this PR?
ntp/test_ntp.pyandroute/test_default_route.pyfail onft2topology testbeds because the upstream neighbor type is wrong inUPSTREAM_ALL_NEIGHBOR_MAP.How did you do it?
Changed
'ft2': ['ut2']to'ft2': ['lt2']intests/common/helpers/constants.py.How did you verify/test it?
Verified on testbed
vms73-t0-7060x6-2(ft2-64 topology, Arista 7060X6):ntp/test_ntp.pyandroute/test_default_route.pyboth pass (verified in original PR sonic-net/sonic-mgmt#24187).Any platform specific information?
Specific to
ft2topology (Arista fanout, 64-port).Documentation
N/A