Merge pull request sonic-net#146 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

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

@@ -15,6 +15,7 @@
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
     neighbor INTERNAL_PEER_V4 send-community
+    neighbor INTERNAL_PEER_V4 ttl-security hops 1
   exit-address-family
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
   neighbor INTERNAL_PEER_V6 update-source Loopback4096
@@ -28,6 +29,7 @@
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
     neighbor INTERNAL_PEER_V6 send-community
+    neighbor INTERNAL_PEER_V6 ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/internal/peer-group.conf.j2

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

@@ -13,6 +13,7 @@
     neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
     neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
     neighbor VOQ_CHASSIS_V4_PEER send-community
+    neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
   exit-address-family
   address-family ipv6
 {% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %}
@@ -24,6 +25,7 @@
     neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
     neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
     neighbor VOQ_CHASSIS_V6_PEER send-community
+    neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2

src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf

@@ -10,6 +10,7 @@
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
     neighbor INTERNAL_PEER_V4 send-community
+    neighbor INTERNAL_PEER_V4 ttl-security hops 1
   exit-address-family
   address-family ipv6
     neighbor INTERNAL_PEER_V6 route-reflector-client
@@ -18,6 +19,7 @@
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
     neighbor INTERNAL_PEER_V6 send-community
+    neighbor INTERNAL_PEER_V6 ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/internal/peer-group.conf.j2

src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_chasiss_packet.conf

@@ -10,6 +10,7 @@
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
     neighbor INTERNAL_PEER_V4 send-community
+    neighbor INTERNAL_PEER_V4 ttl-security hops 1
   exit-address-family
   neighbor INTERNAL_PEER_V6 update-source Loopback4096 
   address-family ipv6
@@ -18,6 +19,7 @@
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
     neighbor INTERNAL_PEER_V6 send-community
+    neighbor INTERNAL_PEER_V6 ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/internal/peer-group.conf.j2

src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf

@@ -9,13 +9,15 @@
     neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
     neighbor INTERNAL_PEER_V4 send-community
+    neighbor INTERNAL_PEER_V4 ttl-security hops 1
   exit-address-family
   address-family ipv6
     neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
     neighbor INTERNAL_PEER_V6 allowas-in 1
     neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
     neighbor INTERNAL_PEER_V6 send-community
+    neighbor INTERNAL_PEER_V6 ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/internal/peer-group.conf.j2

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

@@ -11,6 +11,7 @@
     neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
     neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
     neighbor VOQ_CHASSIS_V4_PEER send-community
+    neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
   exit-address-family
   address-family ipv6
     neighbor VOQ_CHASSIS_V6_PEER allowas-in 1
@@ -20,6 +21,7 @@
     neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
     neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
     neighbor VOQ_CHASSIS_V6_PEER send-community
+    neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2

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

@@ -10,6 +10,7 @@
     neighbor VOQ_CHASSIS_V4_PEER route-map FROM_VOQ_CHASSIS_V4_PEER in
     neighbor VOQ_CHASSIS_V4_PEER route-map TO_VOQ_CHASSIS_V4_PEER out
     neighbor VOQ_CHASSIS_V4_PEER send-community
+    neighbor VOQ_CHASSIS_V4_PEER ttl-security hops 1
   exit-address-family
   address-family ipv6
     neighbor VOQ_CHASSIS_V6_PEER activate
@@ -18,6 +19,7 @@
     neighbor VOQ_CHASSIS_V6_PEER route-map FROM_VOQ_CHASSIS_V6_PEER in
     neighbor VOQ_CHASSIS_V6_PEER route-map TO_VOQ_CHASSIS_V6_PEER out
     neighbor VOQ_CHASSIS_V6_PEER send-community
+    neighbor VOQ_CHASSIS_V6_PEER ttl-security hops 1
   exit-address-family
 !
 ! end of template: bgpd/templates/voq_chassis/peer-group.conf.j2