Skip to content

fix: only disable route check for T2 - #21582

Merged
auspham merged 2 commits into
sonic-net:masterfrom
cyw233:only-disable-route-check-on-t2
Dec 9, 2025
Merged

fix: only disable route check for T2#21582
auspham merged 2 commits into
sonic-net:masterfrom
cyw233:only-disable-route-check-on-t2

Conversation

@cyw233

@cyw233 cyw233 commented Dec 5, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description of PR

Change the temporarily_disable_route_check fixture logic to only apply to T2 topology for now.

Summary:
Fixes # (issue) Microsoft ADO 36101536

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Approach

What is the motivation for this PR?

The current disable-and-enable routeCheck monitor logic is causing test flakiness on some non-T2 platforms (see #16876 (comment)). Certain platforms require additional time to restart the routeCheck monitor, which can leave it inactive when the next test begins and result in false failures. We would like to address this issue urgently in this PR.

In a follow-up PR, I will properly enhance the temporarily_disable_route_check fixture so that:

  • Users can choose which topologies apply the disable-and-enable routeCheck behavior
  • The fixture uses 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 ran the updated login on a non-T2 platform (Mx) and can confirm it's working well:
https://elastictest.org/scheduler/testplan/693272f7392767e9bf67e930
image

I also verified the logic on T2 platform and can confirm it's still having this logic: https://elastictest.org/scheduler/testplan/6932767fbcc3fac23371a83c
image

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@cyw233
cyw233 requested review from a team and wangxin as code owners December 5, 2025 08:53
@mssonicbld

mssonicbld commented Dec 5, 2025

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

azure-pipelines Bot commented Dec 5, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@cyw233
cyw233 force-pushed the only-disable-route-check-on-t2 branch from 3f40b07 to 9720553 Compare December 5, 2025 08:56
@mssonicbld

mssonicbld commented Dec 5, 2025

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

azure-pipelines Bot commented Dec 5, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

ZhaohuiS
ZhaohuiS approved these changes Dec 5, 2025
View reviewed changes

@ZhaohuiS ZhaohuiS left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for the quick fix!

@cyw233

cyw233 commented Dec 6, 2025

Copy link
Copy Markdown
Contributor Author

/azpw run

@mssonicbld

mssonicbld commented Dec 6, 2025

Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines

azure-pipelines Bot commented Dec 6, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld

mssonicbld commented Dec 6, 2025

Copy link
Copy Markdown
Collaborator

/azp run

@github-actions
github-actions Bot requested a review from ZhaohuiS December 6, 2025 00:39
@azure-pipelines

azure-pipelines Bot commented Dec 6, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

cyw233 added 2 commits December 8, 2025 14:43
@cyw233
fix: only disable route check for T2
a419bb9 
Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
@cyw233
Empty commit to re-trigger the pipeline
8ee81d2 
Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
@cyw233
cyw233 force-pushed the only-disable-route-check-on-t2 branch from cfef952 to 8ee81d2 Compare December 8, 2025 03:43
@mssonicbld

mssonicbld commented Dec 8, 2025

Copy link
Copy Markdown
Collaborator

/azp run

@github-actions
github-actions Bot requested a review from ZhaohuiS December 8, 2025 03:44
@azure-pipelines

azure-pipelines Bot commented Dec 8, 2025

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@auspham
auspham enabled auto-merge (squash) December 9, 2025 03:29
@auspham
auspham merged commit 155fa1c into sonic-net:master Dec 9, 2025
21 checks passed
@mssonicbld

mssonicbld commented Dec 12, 2025

Copy link
Copy Markdown
Collaborator

Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#930

mssonicbld added a commit to mssonicbld/sonic-mgmt.msft that referenced this pull request Dec 12, 2025
@mssonicbld
fix: enhance routeCheck toggle logic
cde8a1d 
<!--
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?
-->
@mssonicbld mssonicbld mentioned this pull request Dec 12, 2025
Closed
12 tasks
@cyw233 cyw233 mentioned this pull request Dec 12, 2025
Merged
12 tasks
cyw233 added a commit to Azure/sonic-mgmt.msft that referenced this pull request Dec 12, 2025
@cyw233
fix: enhance routeCheck toggle logic (#21614)
92f4617 
<!--
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?
-->

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
saravanan-nexthop pushed a commit to saravanan-nexthop/sonic-mgmt that referenced this pull request Dec 15, 2025
@cyw233 @saravanan-nexthop
fix: only disable route check for T2 (sonic-net#21582)
157fa44 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Saravanan <saravanan@nexthop.ai>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
@cyw233 @gshemesh2
fix: only disable route check for T2 (sonic-net#21582)
594c76f 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
@cyw233 @gshemesh2
fix: only disable route check for T2 (sonic-net#21582)
40a0181 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
wangxin pushed a commit that referenced this pull request Dec 22, 2025
@cyw233
[manual] [PR:21614] fix: enhance routeCheck toggle logic (#21673)
c82d8f7 
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

What is the motivation for this PR?
This is a follow-up PR of #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:

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
wangxin pushed a commit that referenced this pull request Dec 22, 2025
@cyw233
[manual] [PR:21614] fix: enhance routeCheck toggle logic (#21672)
e1206fe 
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

What is the motivation for this PR?
This is a follow-up PR of #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

image image
I also verified on a T2 platform and I can confirm this logic is applied there: https://elastictest.org/scheduler/testplan/69389e7794f9e10e4c224c66

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
@cyw233 @venu-nexthop
fix: only disable route check for T2 (sonic-net#21582)
1a79ee4 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
thisptr-sh pushed a commit to thisptr-sh/sonic-mgmt that referenced this pull request Jan 21, 2026
@cyw233 @thisptr-sh
fix: only disable route check for T2 (sonic-net#21582)
eaa1ae7 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Priyansh Tratiya <ptratiya@microsoft.com>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
@cyw233 @ytzur1
fix: only disable route check for T2 (sonic-net#21582)
7777067 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Yael Tzur <ytzur@nvidia.com>
anilal-amd pushed a commit to anilal-amd/anilal-forked-sonic-mgmt that referenced this pull request Feb 19, 2026
@cyw233 @ztan-amd
fix: only disable route check for T2 (sonic-net#21582)
e84ef93 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Zhuohui Tan <zhuohui.tan@amd.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@mssonicbld
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
5ee4b84 
…atically (sonic-net#21582)

[submodule] Update submodule sonic-utilities to the latest HEAD automatically
selldinesh pushed a commit to selldinesh/sonic-mgmt that referenced this pull request Apr 1, 2026
@cyw233 @selldinesh
fix: only disable route check for T2 (sonic-net#21582)
fd95e6d 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: selldinesh <dinesh.sellappan@keysight.com>
rraghav-cisco pushed a commit to rraghav-cisco/sonic-mgmt that referenced this pull request Apr 20, 2026
@cyw233 @rraghav-cisco
fix: only disable route check for T2 (sonic-net#21582)
9cc19be 
* fix: only disable route check for T2

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

* Empty commit to re-trigger the pipeline

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>

---------

Signed-off-by: Chenyang Wang <chenyangw233@gmail.com>
Signed-off-by: Raghavendran Ramanathan <rraghav@cisco.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@auspham auspham auspham approved these changes
@ZhaohuiS ZhaohuiS ZhaohuiS approved these changes
@wangxin wangxin Awaiting requested review from wangxin
@rawal01 rawal01 Awaiting requested review from rawal01
@xwjiang-ms xwjiang-ms Awaiting requested review from xwjiang-ms
@saiarcot895 saiarcot895 Awaiting requested review from saiarcot895
@yejianquan yejianquan Awaiting requested review from yejianquan

Assignees

No one assigned

Labels

Approved for msft-202405 Branch Approved for 202411 branch Approved for 202505 branch Cherry Pick Conflict_202411 Cherry Pick Conflict_202505 Created PR to msft-202405 Branch Included in 202411 branch Included in 202505 branch Included in 202511 branch Request for msft-202405 Branch Request for 202411 branch Request for 202505 branch Request for 202511 branch Request to backport a change to 202511 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cyw233 @mssonicbld @ZhaohuiS @auspham @vmittal-msft