[action] [PR:21614] fix: enhance routeCheck toggle logic#931
Closed
mssonicbld wants to merge 1 commit intoAzure:202405from
Closed
[action] [PR:21614] fix: enhance routeCheck toggle logic#931mssonicbld wants to merge 1 commit intoAzure:202405from
mssonicbld wants to merge 1 commit intoAzure:202405from
Conversation
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Further enhance the routeCheck monitor disable-and-enable logic: - Users can choose which topologies apply the disable-and-enable routeCheck behavior - Use `wait_until()` timeout to verify the routeCheck status is as expected before proceeding to the next step Summary: Fixes # (issue) Microsoft ADO 36101536 ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [x] 202411 - [x] 202505 - [x] 202511 ### Approach #### What is the motivation for this PR? This is a follow-up PR of sonic-net/sonic-mgmt#21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running `sudo monit start routeCheck` on some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added a `wait_until()` timeout to verify the routeCheck status is as expected before proceeding to the next step. #### How did you do it? #### How did you verify/test it? I verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a <img width="1606" height="209" alt="image" src="https://github.com/user-attachments/assets/81f5c39b-23b6-4b8c-a2b6-734522702107" /> <img width="1830" height="218" alt="image" src="https://github.com/user-attachments/assets/73357408-f497-40be-ae16-93104246f77e" /> I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66 <img width="1835" height="356" alt="image" src="https://github.com/user-attachments/assets/2647bd40-b44f-48af-aa68-2bda0397ea2d" /> <img width="1893" height="662" alt="image" src="https://github.com/user-attachments/assets/10391c32-0e27-4186-876f-64f7ae137569" /> #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
Collaborator
Author
|
Original PR: sonic-net/sonic-mgmt#21614 |
Collaborator
Author
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
12 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
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
Further enhance the routeCheck monitor disable-and-enable logic:
wait_until()timeout to verify the routeCheck status is as expected before proceeding to the next stepSummary:
Fixes # (issue) Microsoft ADO 36101536
Type of change
Back port request
Approach
What is the motivation for this PR?
This is a follow-up PR of sonic-net/sonic-mgmt#21582. Not all platforms need the "temporarily disable roureCheck monitor" feature, and the routeCheck monitor will take some time to startup after running
sudo monit start routeCheckon some platforms. Therefore, we want to allow the users to choose which topologies they want to apply the disable-and-enable routeCheck behavior (Now only T2, LT2 & UT2 are allowed). Besides, we added await_until()timeout to verify the routeCheck status is as expected before proceeding to the next step.How did you do it?
How did you verify/test it?
I verified it on a T0 platform and I can confirm this logic will be skipped: https://elastictest.org/scheduler/testplan/69389f2d392767e9bf67ef1a
I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation