Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GCU] Update the testcase to avoid duplicate ip range #16816

Merged
merged 1 commit into from
Feb 7, 2025

Conversation

wen587
Copy link
Contributor

@wen587 wen587 commented Feb 6, 2025

Description of PR

ADO: 30945722
Summary: Remove BGP_PEER_RANGE config before rollback
Fixes # (issue)

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?

Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassiveV6"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPVac", "value": {"ip_range": ["192.168.0.0/21"], "name": "BGPVac", "src_address": "10.1.0.32"}}]\n
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassive"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPSLBPassive", "value": {"ip_range": ["10.255.0.0/25"], "name": "BGPSLBPassive", "src_address": "10.1.0.32"}}]

The problem comes from that the running config already has 192.168.0.0 in BGPSLBPassive when add ip_range 192.168.0.0 to BGPVac. Then it cause the ip_range duplicate issue. Though the BGPSLBPassive's ip range change also in the patch, it comes after BGPVac which cause issue during the rollback.
The fix is to clean up the config before rollback.

How did you do it?

Remove BGP_PEER_RANGE config before rollback.

How did you verify/test it?

E2E

Any platform specific information?

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

Documentation

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@wen587 wen587 marked this pull request as ready for review February 6, 2025 06:49
Copy link
Contributor

@matthew-soulsby matthew-soulsby left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

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

LGTM

@StormLiangMS StormLiangMS merged commit 9e9831c into sonic-net:master Feb 7, 2025
14 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 7, 2025
What is the motivation for this PR?
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassiveV6"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPVac", "value": {"ip_range": ["192.168.0.0/21"], "name": "BGPVac", "src_address": "10.1.0.32"}}]\n
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassive"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPSLBPassive", "value": {"ip_range": ["10.255.0.0/25"], "name": "BGPSLBPassive", "src_address": "10.1.0.32"}}]

The problem comes from that the running config already has 192.168.0.0 in BGPSLBPassive when add ip_range 192.168.0.0 to BGPVac. Then it cause the ip_range duplicate issue. Though the BGPSLBPassive's ip range change also in the patch, it comes after BGPVac which cause issue during the rollback.
The fix is to clean up the config before rollback.

How did you do it?
Remove BGP_PEER_RANGE config before rollback.

How did you verify/test it?
E2E
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 7, 2025
What is the motivation for this PR?
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassiveV6"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPVac", "value": {"ip_range": ["192.168.0.0/21"], "name": "BGPVac", "src_address": "10.1.0.32"}}]\n
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassive"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPSLBPassive", "value": {"ip_range": ["10.255.0.0/25"], "name": "BGPSLBPassive", "src_address": "10.1.0.32"}}]

The problem comes from that the running config already has 192.168.0.0 in BGPSLBPassive when add ip_range 192.168.0.0 to BGPVac. Then it cause the ip_range duplicate issue. Though the BGPSLBPassive's ip range change also in the patch, it comes after BGPVac which cause issue during the rollback.
The fix is to clean up the config before rollback.

How did you do it?
Remove BGP_PEER_RANGE config before rollback.

How did you verify/test it?
E2E
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202411: #16840

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #16841

mssonicbld pushed a commit that referenced this pull request Feb 8, 2025
What is the motivation for this PR?
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassiveV6"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPVac", "value": {"ip_range": ["192.168.0.0/21"], "name": "BGPVac", "src_address": "10.1.0.32"}}]\n
Patch Applier: * [{"op": "remove", "path": "/BGP_PEER_RANGE/BGPSLBPassive"}]\n
Patch Applier: * [{"op": "add", "path": "/BGP_PEER_RANGE/BGPSLBPassive", "value": {"ip_range": ["10.255.0.0/25"], "name": "BGPSLBPassive", "src_address": "10.1.0.32"}}]

The problem comes from that the running config already has 192.168.0.0 in BGPSLBPassive when add ip_range 192.168.0.0 to BGPVac. Then it cause the ip_range duplicate issue. Though the BGPSLBPassive's ip range change also in the patch, it comes after BGPVac which cause issue during the rollback.
The fix is to clean up the config before rollback.

How did you do it?
Remove BGP_PEER_RANGE config before rollback.

How did you verify/test it?
E2E
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants