Fix "override config" tests to support LT2/FT2#22696
Open
kazinator-arista wants to merge 2 commits intosonic-net:masterfrom
Open
Fix "override config" tests to support LT2/FT2#22696kazinator-arista wants to merge 2 commits intosonic-net:masterfrom
kazinator-arista wants to merge 2 commits intosonic-net:masterfrom
Conversation
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
github-actions
bot
requested review from
bingwang-ms,
wenyiz2021 and
yutongzhang-microsoft
davidm-arista
added
Request for msft-202503 Branch
Request for 202511 branch
bingwang-ms
reviewed
Mar 5, 2026
| compare_dicts_ignore_list_order(initial_config[table], current_config[table]), | ||
| "empty input ACL_TABLE compare fail!" | ||
| ) | ||
| if not compare_dicts_ignore_list_order(initial_config[table], current_config[table]): |
Collaborator
There was a problem hiding this comment.
Can you help me understand why we need to ignore list order for ACL table? How is that working before?
Author
There was a problem hiding this comment.
This is something that came from #12763 and was discussed there.
I'm being careful to preserve that comparison expression in order to not regress whatever issue that addressed.
Collaborator
|
Can you please fix DCO? Thanks |
Collaborator
|
/azp run Azure.sonic-mgmt |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
* tests/override_config_table/test_override_config_table.py (load_minigraph_with_golden_empty_input): This function asserts on the first discrepancy found. We instead gather the names of the nonmatching tables into a list, and assert if the list is not empty, showing the list in the assertion message. * tests/override_config_table/test_override_config_table_masic.py: Similar changes to multi-asic version of test (load_minigraph_with_golden_empty_input): The difference is that rather than gathering names of nonmatching tables, we have (asic, tasble) tuples. Signed-Off-By: Kaz Kylheku <[email protected]>
In the test case test_load_minigraph_with_golden_config, the function load_minigraph_with_golden_empty_input asserts. This function expects all the tables to be identical after the golden config is overridden to be empty. But it looks as if the golden config is the source of several configurations: the "BMP" table, and "fec" : "rs" entries in the "PORT". Thus, when the golden config is replaced with an empty configuration, the entire "BMP" table, well as those "fec" properties in the "PORT" table, disappear. We propose a variable GOLDEN_OVERRIDDEN_TABLES for additional tables which that function should skip. This is similar to the existing variable NON_USER_CONFIG_TABLES which non-user-config tables that need to be skipped. tests/override_config_table/test_override_config_table.py (GOLDEN_OVERRIDDEN_TABLES): New variable. (load_minigraph_with_golden_empty_input): Skip tables found in GOLDEN_OVERRIDDEN_TABLES. tests/override_config_table/test_override_config_table_masic.py: Same changes as in test_override_config_table.py. Signed-Off-By: Kaz Kylheku <[email protected]>
kazinator-arista
force-pushed
the
master
branch
from
26cc7fc to
174038f
Compare
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
bingwang-ms
approved these changes
Mar 19, 2026
Collaborator
|
@kazinator-arista Please fix the pre-check failure |
Collaborator
|
@kazinator-arista — This PR has 2 CI failures (Static Analysis + Azure build). Could you investigate and fix? Has 1 approval from @bingwang-ms, pending @wenyiz2021 @yutongzhang-microsoft. This fixes override_config tests for LT2/FT2, tracked in aristanetworks/sonic-qual.msft#583 and #582. |
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
5 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
This PR gets two test cases working, which fail due to finding a discrepancy
in two tables.
The fix is to ignore the FEATURE and PORT tables in the test, which
have some run-time configuration state that is altered when the golden
config is overridden empty. FEATURE is missing the "BMP" node, and
records in PORT are missing "fec" : "rs" fields.
The first commit in the PR is an improvement in the diagnostic that occurs
when these tests fail due to a configuration discrepancy. Rather than stopping
on the first discrepancy (non-matching configuration table), all mismatches
are identified, and reported in a single exception.
Type of change
Back port request
How did you verify/test it?
Failing tests went green on LT2 and FT2 DUTs in our test bed, without regressions in numerous other duts.