[action] [PR:26676] [dualtor] Load minigraph before golden config generation - #27337
Merged
Merged
Conversation
…6676) Approach What is the motivation for this PR? Fix a regression introduced when dualtor was added to the golden config generation path. dualtor golden config now copies PORT, so it needs the same minigraph preload step that already exists for lt2 and ft2. How did you do it? Updated ansible/config_sonic_basedon_testbed.yml so the existing config load_minigraph -y step runs for dualtor before golden_config_db.json is generated. - when: "'lt2' in topo or 'ft2' in topo" + when: "'lt2' in topo or 'ft2' in topo or 'dualtor' in topo" How did you verify/test it? Inspected failed pretest logs from tst-esx-31. All failed during pretest setup sanity with unused routed ports left as admin up / oper down. Applied the fix and sanitized the duts , ran deploy-mg and pret-tests Any platform specific information? N/A Supported testbed topology if it's a new test case? N/A Signed-off-by: mssonicbld <sonicbld@microsoft.com>
21 tasks
Collaborator
Author
|
/azp run |
Collaborator
Author
|
Original PR: #26676 |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
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.
Description of PR
PR #26376 added dual-ToR golden config generation support for
prober_typeand
neighbor_mode. As part of that change, dualtor topologies startedgenerating
golden_config_db.jsonwith aPORTtable copied from minigraph.The deploy flow already runs
config load_minigraph -ybefore golden configgeneration for
lt2andft2, because those topologies modify/copyPORTand need the DUT config to reflect testbed-specific interface admin state
first. The new dualtor golden config path missed this preload step.
Without the preload, unused routed ports can be preserved as
admin upingolden_config_db.json. These ports have no link, remainoper down, andpretest interface sanity fails.
This PR extends the existing preload condition to include dualtor.
Summary:
Fixes #26673
Type of change
Back port request
Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type: regression
Tested branch
Test result
202605
Failure Results
test_pretest.log
test_pretest.xml
Pass Results (after fix)
test_pretest.log
test_pretest.xml
sonic-mgmt change under test:
Note: Both before and after tests used the same SONiC image/build; the validated change is in sonic-mgmt.
Approach
What is the motivation for this PR?
Fix a regression introduced when dualtor was added to the golden config
generation path. dualtor golden config now copies
PORT, so it needs thesame minigraph preload step that already exists for
lt2andft2.How did you do it?
Updated
ansible/config_sonic_basedon_testbed.ymlso the existingconfig load_minigraph -ystep runs for dualtor beforegolden_config_db.jsonis generated.How did you verify/test it?
Inspected failed pretest logs from tst-esx-31.
All failed during pretest setup sanity with unused routed ports
left as admin up / oper down.
Applied the fix and sanitized the duts , ran deploy-mg and pret-tests
Any platform specific information?
N/A
Supported testbed topology if it's a new test case?
N/A
Documentation
N/A