Skip IP range duplicate check in validate_bgp_peer_group for different vnets by alawing · Pull Request #4179 · sonic-net/sonic-utilities

alawing · 2026-01-06T09:21:14Z

What I did

Skip IP range duplicate check in validate_bgp_peer_group for different vnets
Related issue: #2145

How I did it

Check duplicates only when both vnet_name and ip_range match

How to verify it

testbed tests and unit tests

mssonicbld · 2026-01-06T09:21:22Z

/azp run

azure-pipelines · 2026-01-06T09:21:32Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

This PR modifies the BGP peer group validation logic to allow IP range reuse across different VRFs. Previously, duplicate IP ranges were rejected regardless of VRF context, but now the validation only flags duplicates when both the IP range and VRF match.

Key Changes

Modified validate_bgp_peer_group to track IP ranges per VRF using tuple keys (ip, vrf_name)
Added logic to default missing vrf_name to "default" VRF
Updated error messages to include VRF information when reporting duplicates

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

generic_config_updater/gu_common.py

mssonicbld · 2026-01-06T09:41:37Z

/azp run

azure-pipelines · 2026-01-06T09:41:47Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-01-06T09:45:13Z

/azp run

azure-pipelines · 2026-01-06T09:45:20Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

generic_config_updater/gu_common.py

mssonicbld · 2026-01-07T00:04:51Z

/azp run

azure-pipelines · 2026-01-07T00:05:01Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

generic_config_updater/gu_common.py

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

generic_config_updater/gu_common.py

mssonicbld · 2026-01-08T07:15:23Z

/azp run

azure-pipelines · 2026-01-08T07:15:33Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/generic_config_updater/gu_common_test.py

mssonicbld · 2026-01-08T09:26:18Z

/azp run

prsunny

lgtm @StormLiangMS , can you review and merge?

…rent Signed-off-by: alawing <[email protected]>

Signed-off-by: alawing <[email protected]>

Co-authored-by: Copilot <[email protected]> Signed-off-by: alawing <[email protected]>

Signed-off-by: alawing <[email protected]>

Co-authored-by: Copilot <[email protected]> Signed-off-by: alawing <[email protected]>

Signed-off-by: alawing <[email protected]>

mssonicbld · 2026-01-13T19:10:05Z

/azp run

azure-pipelines · 2026-01-13T19:10:15Z

Azure Pipelines successfully started running 1 pipeline(s).

StormLiangMS

lgtm

…t vnets (sonic-net#4179) What I did Skip IP range duplicate check in validate_bgp_peer_group for different vnets Related issue: sonic-net#2145 How I did it Check duplicates only when both vnet_name and ip_range match How to verify it testbed tests and unit tests

mssonicbld · 2026-01-22T21:51:02Z

Cherry-pick PR to 202511: #4215

mssonicbld · 2026-02-02T19:11:24Z

Cherry-pick PR to msft-202506: Azure/sonic-utilities.msft#281

Copilot AI review requested due to automatic review settings January 6, 2026 09:21

Copilot started reviewing on behalf of alawing January 6, 2026 09:21 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

alawing changed the title ~~avoid ip_range check in validate_bgp_peer_group if vrf_name are different~~ Skip IP range duplicate check in validate_bgp_peer_group for different VRFs Jan 6, 2026

alawing requested a review from Copilot January 6, 2026 09:54

Copilot started reviewing on behalf of alawing January 6, 2026 09:54 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

anish-n suggested changes Jan 6, 2026

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

alawing requested review from anish-n and Copilot January 7, 2026 00:05

Copilot started reviewing on behalf of alawing January 7, 2026 00:06 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

alawing changed the title ~~Skip IP range duplicate check in validate_bgp_peer_group for different VRFs~~ Skip IP range duplicate check in validate_bgp_peer_group for different vnets Jan 7, 2026

alawing requested a review from Copilot January 7, 2026 00:16

Copilot started reviewing on behalf of alawing January 7, 2026 00:16 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

alawing requested a review from Copilot January 8, 2026 07:32

Copilot started reviewing on behalf of alawing January 8, 2026 07:32 View session

Copilot AI reviewed Jan 8, 2026

View reviewed changes

tests/generic_config_updater/gu_common_test.py Outdated Show resolved Hide resolved

tests/generic_config_updater/gu_common_test.py Outdated Show resolved Hide resolved

prsunny approved these changes Jan 12, 2026

View reviewed changes

alawing and others added 9 commits January 13, 2026 11:09

avoid ip_range check in validate_bgp_peer_group if vrf_name are diffe…

7513817

…rent Signed-off-by: alawing <[email protected]>

fix line too long issue

0a469c5

Signed-off-by: alawing <[email protected]>

Update generic_config_updater/gu_common.py

679dcbd

Co-authored-by: Copilot <[email protected]> Signed-off-by: alawing <[email protected]>

fixing the way getting vnet name

2e982a1

Signed-off-by: alawing <[email protected]>

added test cases for bgp_peer_group in same or different vnets

c9b77be

Signed-off-by: alawing <[email protected]>

resolve same peer_group_name issue

e32888d

Signed-off-by: alawing <[email protected]>

Update tests/generic_config_updater/gu_common_test.py

74ed7e8

Co-authored-by: Copilot <[email protected]> Signed-off-by: alawing <[email protected]>

rename same_vnet to vrf_name, and addressed comments

ca28715

Signed-off-by: alawing <[email protected]>

addressed comment

ef8f334

Signed-off-by: alawing <[email protected]>

alawing force-pushed the alawing/bgp_peer_range branch from 89462b3 to ef8f334 Compare January 13, 2026 19:09

StormLiangMS approved these changes Jan 15, 2026

View reviewed changes

StormLiangMS merged commit 137d594 into sonic-net:master Jan 15, 2026
8 checks passed

vmittal-msft added Request for 202511 Branch Approved for 202511 Branch labels Jan 22, 2026

mssonicbld mentioned this pull request Jan 22, 2026

[action] [PR:4179] Skip IP range duplicate check in validate_bgp_peer_group for different vnets #4215

Merged

mssonicbld added the Created PR to 202511 Branch label Jan 22, 2026

mssonicbld added Included in 202511 Branch and removed Created PR to 202511 Branch labels Jan 22, 2026

prsunny added Request for msft-202506 Branch Approved for msft-202506 Branch labels Feb 2, 2026

mssonicbld mentioned this pull request Feb 2, 2026

[action] [PR:4179] Skip IP range duplicate check in validate_bgp_peer_group for different vnets Azure/sonic-utilities.msft#281

Merged

mssonicbld added the Created PR to msft-202506 Branch label Feb 2, 2026

mssonicbld added Included in msft-202506 Branch and removed Created PR to msft-202506 Branch labels Feb 2, 2026

Conversation

alawing commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What I did

How I did it

How to verify it

Uh oh!

mssonicbld commented Jan 6, 2026

Uh oh!

azure-pipelines bot commented Jan 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Jan 6, 2026

Uh oh!

azure-pipelines bot commented Jan 6, 2026

Uh oh!

mssonicbld commented Jan 6, 2026

Uh oh!

azure-pipelines bot commented Jan 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

mssonicbld commented Jan 7, 2026

Uh oh!

azure-pipelines bot commented Jan 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

mssonicbld commented Jan 8, 2026

Uh oh!

azure-pipelines bot commented Jan 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Jan 8, 2026

Uh oh!

prsunny left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Jan 13, 2026

Uh oh!

azure-pipelines bot commented Jan 13, 2026

Uh oh!

StormLiangMS left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mssonicbld commented Jan 22, 2026

Uh oh!

mssonicbld commented Feb 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

alawing commented Jan 6, 2026 •

edited

Loading