[code sync] Merge code from sonic-net/sonic-mgmt:master to master#4
Merged
yutongzhang-microsoft merged 7 commits intomasterfrom Feb 17, 2025
Merged
[code sync] Merge code from sonic-net/sonic-mgmt:master to master#4yutongzhang-microsoft merged 7 commits intomasterfrom
yutongzhang-microsoft merged 7 commits intomasterfrom
Conversation
github-actions
bot
commented
Feb 17, 2025
github-actions
bot
commented
…dward after port toggle (sonic-net#16959) …dward after port toggle Description of PR Summary: Fixes flakiness nhop_group failures on chassis. Approach What is the motivation for this PR? Fixes flakiness nhop_group failures on chassis. We observe flakiness failure on chassis devices Suspect it's because the route is not programmed into hardware Add external sleep to make sure route is in hardware How did you do it? Add extra waiting time for chassis device port toggle tests. How did you verify/test it? Run on PR test, and physical test passes ipfwd/test_nhop_group.py::test_nhop_group_member_count PASSED [ 20%] ipfwd/test_nhop_group.py::test_nhop_group_member_order_capability[str3-xx-1-2] SKIPPED (Order ECMP is not configured so skipping the test-case) [ 40%] ipfwd/test_nhop_group.py::test_nhop_group_interface_flap[str3-xx-1-2] PASSED [ 60%] ipfwd/test_nhop_group.py::test_nhop_group_member_order_capability[str3-xx-1-0] SKIPPED (Order ECMP is not configured so skipping the test-case) [ 80%] ipfwd/test_nhop_group.py::test_nhop_group_interface_flap[str3-xx-1-2] PASSED [100%] authorized by: [email protected]
Description of PR Summary: Fixes sonic-net#16436, caused by added BGP check in sonic-net#15936, which doesn't account for T2 BGP time to come up Approach What is the motivation for this PR? Function wait_bgp_sessions timeout is too short for T2, fails in test_mgmt_ipv6_only test suite causing a fixture to error wrongly and not teardown properly leaving TB in bad state without ipv4 mgmt ip How did you do it? Increase timeout to 900s from 120s if duthost it is checking is supervisor How did you verify/test it? Run locally on T2 See for passing test: 17/01/2025 07:34:39 utilities.wait_until L0153 DEBUG | check_bgp_session_state_all_asics is False, wait 10 seconds and check again 17/01/2025 07:34:49 utilities.wait_until L0135 DEBUG | Time elapsed: 164.073392 seconds Confirming it needs more than 120 seconds Signed-off-by: Javier Tan [email protected] Co-authored-by: Jianquan Ye <[email protected]>
Summary: The previous test scripts did not present any messages when an assertion error is triggered, which makes it difficult for people who are not familiar with the SRv6 stack to triage the error. I added several assertion error messages to help people understand the errors.
…ring issue (sonic-net#16976) What is the motivation for this PR? It should be the day1 issue, but it was exposed by PR sonic-net#16897 How did you do it? add quotes to ensure that the entire string is treated as a single argument How did you verify/test it? local run pfcwd/test_pfcwd_timer_accuracy.py::TestPfcwdAllTimer::test_pfcwd_timer_accuracy[bjw-can-7050qx-1] ----------------------------------------------------------------------------------- live log call ----------------------------------------------------------------------------------- 12:56:13 test_pfcwd_timer_accuracy.retrieve_times L0349 WARNING| Get timestamp: An unexpected error occurred: pattern [P]FC_STORM_END err run module shell failed, Ansible Results => failed = True changed = True rc = 1 cmd = grep "[P]FC_STORM_END" /var/log/syslog start = 2025-02-14 12:56:13.380668 end = 2025-02-14 12:56:13.388690 delta = 0:00:00.008022 msg = non-zero return code invocation = {'module_args': {'_raw_params': 'grep "[P]FC_STORM_END" /var/log/syslog', '_uses_shell': True, 'warn': False, 'stdin_add_newline': True, 'strip_empty_ends': True, 'argv': None, 'chdir': None, 'executable': None, 'creates': None, 'removes': None, 'stdin': None}} _ansible_no_log = None stdout = stderr = 12:56:15 test_pfcwd_timer_accuracy.run_test L0221 WARNING| storm_start_ms 1739537704533 or storm_detect_ms 1739537705154 or storm_end_ms 0 or storm_restore_ms 1739537737593 is 0 12:56:15 test_pfcwd_timer_accuracy.run_test L0227 WARNING| Skip this loop due to missing timestamps PASSED
…onic-net#16978) * Fix to correct the parameters passed to this API get_macsec_counters
What is the motivation for this PR? Confirmed with Arista, those error logs are generated by swss restarting. It's expected to be found in 720DT, hence ignore non-impact error log in syslog How did you do it? Ignore non-impact error log in syslog How did you verify/test it? Run test
8 tasks
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
8 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.