[muti-asic] Updated BGP community for Internal routes (sonic-net#7617)

Following changes are done: Internal routes are tagged with no-export instead of local-AS Option to add User Define BGP community on top of no-export
carl-nokia · Aug 7, 2021 · 08a4d1e · 08a4d1e
1 parent c6e9b1c
commit 08a4d1e
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -32,7 +32,12 @@ ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq {{ loop.index * 5 }} permit {{ prefi
 !
 {% if DEVICE_METADATA['localhost']['sub_role'] == 'FrontEnd' or DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+{% if constants.bgp.peers is defined and constants.bgp.peers.internal is defined and constants.bgp.peers.internal.community is defined %}
+  on-match next
+route-map HIDE_INTERNAL permit 20
+  set community {{ constants.bgp.peers.internal.community }} additive
+{% endif %}
 {% set multi_asic = True %}
 !
 {% endif %}

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -34,7 +34,11 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+  on-match next
+route-map HIDE_INTERNAL permit 20
+  set community 1234:5678 additive
+!
 !
 router bgp 55555
 !

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json
@@ -29,6 +29,11 @@
                 "enabled": true,
                 "ipv4": 32,
                 "ipv6": 32
+            },
+            "peers": {
+               "internal": {
+                  "community": "1234:5678"
+               }
             }
         }
     }

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -16,7 +16,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+!
 !
 router bgp 55555
 !

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -16,7 +16,8 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
+!
 !
 router bgp 55555
 !

diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -57,7 +57,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 5 permit 10.10.10.0/24
 ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq 10 permit fc01::/64
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 router bgp 55555
 !

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100

diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100

diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -35,7 +35,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00:1::/64
 !
 !
 route-map HIDE_INTERNAL permit 10
-  set community local-AS
+  set community no-export
 !
 !
 router bgp 65100