Skip to content

Commit 6a5195e

Browse files
mssonicbldabdosi
andauthored
Revert iBGP GTSM feature for VOQ Chassis (#17037) (#17347)
What I did: Revert the GTSM feature for VOQ iBGP session done as part of #16777. Why I did: On VOQ chassis BGP packets go over Recycle Port and then for Ingress Pipeline Routing making ttl as 254 and failing single hop check. Signed-off-by: Abhishek Dosi <[email protected]> Co-authored-by: abdosi <[email protected]>
1 parent 400717d commit 6a5195e

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

dockers/docker-fpm-frr/frr/bgpd/templates/voq_chassis/peer-group.conf.j2

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
1414
neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
1515
neighbor VOQ_CHASSIS_V4_PEER send-community
16-
neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
1716
exit-address-family
1817
address-family ipv6
1918
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
@@ -25,7 +24,6 @@
2524
neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
2625
neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
2726
neighbor VOQ_CHASSIS_V6_PEER send-community
28-
neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
2927
exit-address-family
3028
!
3129
! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2

src/sonic-bgpcfgd/tests/data/voq_chassis/peer-group.conf/result_all.conf

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
1212
neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
1313
neighbor VOQ_CHASSIS_V4_PEER send-community
14-
neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
1514
exit-address-family
1615
address-family ipv6
1716
neighbor VOQ_CHASSIS_V6_PEER allowas-in 1
@@ -21,7 +20,6 @@
2120
neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
2221
neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
2322
neighbor VOQ_CHASSIS_V6_PEER send-community
24-
neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
2523
exit-address-family
2624
!
2725
! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2

src/sonic-bgpcfgd/tests/data/voq_chassis/peer-group.conf/result_base.conf

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
1111
neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
1212
neighbor VOQ_CHASSIS_V4_PEER send-community
13-
neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
1413
exit-address-family
1514
address-family ipv6
1615
neighbor VOQ_CHASSIS_V6_PEER activate
@@ -19,7 +18,6 @@
1918
neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
2019
neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
2120
neighbor VOQ_CHASSIS_V6_PEER send-community
22-
neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
2321
exit-address-family
2422
!
2523
! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2

0 commit comments

Comments
 (0)