Skip to content

Shutdown BGP for PCBB tests instead of stopping processes#18267

Merged
kevinskwang merged 1 commit intosonic-net:masterfrom
rbpittman:pcbb_bgp_setup
Jun 16, 2025
Merged

Shutdown BGP for PCBB tests instead of stopping processes#18267
kevinskwang merged 1 commit intosonic-net:masterfrom
rbpittman:pcbb_bgp_setup

Conversation

@rbpittman
Copy link
Contributor

@rbpittman rbpittman commented May 7, 2025 •
edited
Loading

Description of PR

Summary:

When running test_tunnel_qos_remap.py, the BGP bgpmon and bgpd service stop and start hacking does not correctly bring BGP back up on Cisco-8000 devices. Modify shutdown/startup to match QOS SAI's test fixtures, as revised by PR #15108.

Note that this only causes issues with BGP if the syncd swap is not performed (i.e. it's already loaded and --qos_swap_syncd is set to False). If the swap is performed, then the entire config is reloaded, which masks the fact that BGP didn't come back up correctly.

Type of change

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

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Validated on dualtor-aa Cisco-8000 that BGP comes back up after running test_tunnel_qos_remap.py xoff test cases.
Ran without doing dynamic syncd container swap, per above note about this masking the BGP issue.
Output after test pass shown here as sessions are up for 39 seconds.

root@tor-dut-1:/home/cisco# show ip bgp sum

IPv4 Unicast Summary:
BGP router identifier 10.1.0.33, local AS number 65100 vrf-id 0
BGP table version 32014
RIB entries 12809, using 1639552 bytes of memory
Peers 4, using 82368 KiB of memory
Peer groups 4, using 256 bytes of memory


Neighbhor      V     AS    MsgRcvd    MsgSent    TblVer    InQ    OutQ  Up/Down      State/PfxRcd  NeighborName
-----------  ---  -----  ---------  ---------  --------  -----  ------  ---------  --------------  --------------
10.0.1.57      4  64600       6501       6502     32014      0       0  00:00:39             6402  ARISTA01T1
10.0.1.59      4  64600       6501       6503     32014      0       0  00:00:39             6402  ARISTA02T1
10.0.1.61      4  64600       6501       6503     32014      0       0  00:00:39             6402  ARISTA03T1
10.0.1.63      4  64600       6501       6503     32014      0       0  00:00:39             6402  ARISTA04T1

Total number of neighbors 4

Any platform specific information?

Test on Cisco-8000, but affects code-path for all vendors. Now matches procedure in qos_sai_base.py.

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

Documentation

@mssonicbld
Copy link
Collaborator

mssonicbld commented May 7, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented May 7, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@rbpittman
Copy link
Contributor Author

rbpittman commented May 19, 2025

@kevinskwang

wsycqyz
wsycqyz approved these changes Jun 16, 2025
View reviewed changes
Copy link
Contributor

@wsycqyz wsycqyz left a comment

Choose a reason for hiding this comment

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

lğtm

kevinskwang
kevinskwang approved these changes Jun 16, 2025
View reviewed changes
Copy link
Contributor

@kevinskwang kevinskwang left a comment

Choose a reason for hiding this comment

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

LGTM

@kevinskwang kevinskwang merged commit 7876ec9 into sonic-net:master Jun 16, 2025
15 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jun 16, 2025
@rbpittman @mssonicbld
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
0237b3f
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Jun 16, 2025
@rbpittman @mssonicbld
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
5375b51
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 16, 2025

Cherry-pick PR to 202505: #19010

@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 16, 2025

Cherry-pick PR to 202411: #19011

This was referenced Jun 16, 2025
Merged
Merged
mssonicbld pushed a commit that referenced this pull request Jun 16, 2025
@rbpittman @mssonicbld
Shutdown BGP instead of stopping some processes. (#18267)
ab5fd70
mssonicbld pushed a commit that referenced this pull request Jun 16, 2025
@rbpittman @mssonicbld
Shutdown BGP instead of stopping some processes. (#18267)
5af290e
@rbpittman rbpittman deleted the pcbb_bgp_setup branch June 17, 2025 12:39
sdszhang pushed a commit to sdszhang/sonic-mgmt that referenced this pull request Jun 30, 2025
@r12f
[202412] Code sync sonic-net/sonic-mgmt:202411 => 202412 (sonic-net#430)
30fd1c9 
Code sync sonic-net/sonic-mgmt:202411 => 202412

```
*   86163d9 (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250620:0224 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\
| * 6c7825f (base/202411) Justin Wong 250611:2109 - Skip test_bgp_multipath_relax.py on t1-isolated (sonic-net#18558)
| * 829aa40 Chun'ang Li 250619:1618 - [CI][202411]update pr test template reference (sonic-net#19059)
| * 6f2a1bd prabhataravind 250617:1800 - Fix port mapping for new 4280 hwskus (sonic-net#18802) (sonic-net#19030)
| * 66c7667 ganglv 250617:1623 - [202411] Update timeout for gnmi subscribe API (sonic-net#19045)
| * 8f0a97b Justin Wong 250611:2146 - Extend bgp command check to allow multipath routes and "best" routes (sonic-net#18910)
| * 12b7793 StormLiangMS 250611:1110 - [XFAIL: test_crm_available.py] set xfail of test_crm_available on dualtor platform (sonic-net#18874)
| * ab5fd70 rbpittman 250615:2148 - Shutdown BGP instead of stopping some processes. (sonic-net#18267)
| * 3f35fa2 Harish Kalyanaraman 250321:0332 - Increase GCUTIMEOUT value for nokia-armhf platforms (sonic-net#17420)
| * 48bf447 xwjiang-ms 250613:1238 - [202411] Support Ubuntu 24 server in KVM (sonic-net#18929)
| * 194b907 rbpittman 250612:2057 - Dualtor AA enablement for QOS SAI (sonic-net#17765) (sonic-net#17911)
```
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Aug 7, 2025
@rbpittman @nissampa
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
9b01368
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
@rbpittman
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
4680790 
Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 16, 2025
@rbpittman @gshemesh2
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
9fcf64e 
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
@rbpittman @AharonMalkin
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
021ee39 
Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
@rbpittman @gshemesh2
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
97ac8c6 
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
@rbpittman @venu-nexthop
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
9cca8f0
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
@rbpittman @gshemesh2
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
b0f4cd2 
Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
@rbpittman @ytzur1
Shutdown BGP instead of stopping some processes. (sonic-net#18267)
3146892 
Signed-off-by: Yael Tzur <ytzur@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wsycqyz wsycqyz wsycqyz approved these changes

@bpar9 bpar9 bpar9 approved these changes

@kevinskwang kevinskwang kevinskwang approved these changes

Assignees

No one assigned

Labels

Approved for 202411 branch Approved for 202505 branch Included in 202411 branch Included in 202505 branch Request for 202411 branch Request for 202505 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rbpittman @mssonicbld @wsycqyz @bpar9 @kevinskwang