Skip IP range duplicate check in validate_bgp_peer_group for different vnets

<!--
    Please make sure you've read and understood our contributing guidelines:
    https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

    ** Make sure all your commits include a signature generated with `git commit -s` **

    If this is a bug fix, make sure your description includes "closes #xxxx",
    "fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related
    issue when the PR is merged.

    If you are adding/modifying/removing any command or utility script, please also
    make sure to add/modify/remove any unit tests from the tests
    directory as appropriate.

    If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'
    subcommand, or you are adding a new subcommand, please make sure you also
    update the Command Line Reference Guide (doc/Command-Reference.md) to reflect
    your changes.

    Please provide the following information:
-->

#### 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

Author: mssonicbld

generic_config_updater/gu_common.py

@@ -311,10 +311,17 @@ def validate_bgp_peer_group(self, config_db):
             # TODO: convert string to IpAddress object for better handling of IPs
             # TODO: validate range intersection
             ip_range = peer_group["ip_range"]
+
+            # Use "default" vrf name if not specified
+            name_split = peer_group_name.split('|')
+            vrf_name = name_split[0] if len(name_split) > 1 else "default"
+
             for ip in ip_range:
-                if ip in visited:
-                    return False, f"{ip} is duplicated in BGP_PEER_RANGE: {set([peer_group_name, visited[ip]])}"
-                visited[ip] = peer_group_name
+                key = (ip, vrf_name)
+                if key in visited:
+                    return False, (f"{ip} with vrf {vrf_name} is duplicated in BGP_PEER_RANGE: "
+                                   f"{set([peer_group_name, visited[key]])}")
+                visited[key] = peer_group_name
 
         return True, None
 

tests/generic_config_updater/gu_common_test.py

@@ -244,6 +244,31 @@ def test_validate_bgp_peer_group__valid_non_intersecting_ip_ranges__returns_true
         self.assertTrue(actual)
         self.assertIsNone(error)
 
+    def test_validate_bgp_peer_group__valid_intersecting_ip_ranges_in_different_vrfs__returns_true(self):
+        # Arrange
+        config_wrapper = gu_common.ConfigWrapper()
+        config = {
+            "BGP_PEER_RANGE":
+            {
+                "VnetA|WLPARTNER_PASSIVE_V4": {
+                    "ip_range": ["1.1.1.1/31", "10.10.10.10/16", "100.100.100.100/24"]
+                },
+                "VnetB|WLPARTNER_PASSIVE_V4": {
+                    "ip_range": ["1.1.1.1/31", "10.10.10.10/16", "100.100.100.100/24"]
+                },
+                "WLPARTNER_PASSIVE_V4": {
+                    "ip_range": ["1.1.1.1/31", "10.10.10.10/16", "100.100.100.100/24"]
+                }
+            }
+        }
+
+        # Act
+        actual, error = config_wrapper.validate_bgp_peer_group(config)
+
+        # Assert
+        self.assertTrue(actual)
+        self.assertIsNone(error)
+
     def test_validate_bgp_peer_group__same_ip_prefix__return_false(self):
         # duplicate v4 within same ip_range
         self.check_validate_bgp_peer_group(
@@ -275,15 +300,26 @@ def test_validate_bgp_peer_group__same_ip_prefix__return_false(self):
             duplicated_ip="fc00:1::32/16")
 
     def check_validate_bgp_peer_group(self, ip_range, other_ip_range=[], duplicated_ip=None):
+        # Check both default vrf and same vrf name in non-default vrf
+        self._check_validate_bgp_peer_group(ip_range, other_ip_range, duplicated_ip, is_default_vrf=False)
+        self._check_validate_bgp_peer_group(ip_range, other_ip_range, duplicated_ip, is_default_vrf=True)
+
+    def _check_validate_bgp_peer_group(self, ip_range, other_ip_range=[], duplicated_ip=None, is_default_vrf=False):
         # Arrange
         config_wrapper = gu_common.ConfigWrapper()
+        if is_default_vrf:
+            peer_group_name_1 = "BGPSLBPassive"
+            peer_group_name_2 = "BgpVac"
+        else:
+            peer_group_name_1 = "VnetA|WLPARTNER_PASSIVE_V4"
+            peer_group_name_2 = "VnetA|WLPARTNER_PASSIVE_V4_2"
         config = {
             "BGP_PEER_RANGE":
             {
-                "BGPSLBPassive": {
+                peer_group_name_1: {
                     "ip_range": ip_range
                 },
-                "BgpVac": {
+                peer_group_name_2: {
                     "ip_range": other_ip_range
                 },
             }