Skip to content

Commit 7bdf8d4

Browse files
abdosiabdosi
authored
Update internal template peer-group.conf.j2 for ttl-security hops command. (sonic-net#21117)
What I did: Fixes: sonic-net#21116 Why I did: FRR behavior change w.r.t to command ttl-security hops <> from being removed from address-family .
1 parent def5166 commit 7bdf8d4

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
neighbor INTERNAL_PEER_V6 peer-group
66
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
77
neighbor INTERNAL_PEER_V4 update-source Loopback4096
8+
neighbor INTERNAL_PEER_V4 ttl-security hops 1
89
{% endif %}
910
address-family ipv4
1011
{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
@@ -15,10 +16,10 @@
1516
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1617
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1718
neighbor INTERNAL_PEER_V4 send-community
18-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1919
exit-address-family
2020
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
2121
neighbor INTERNAL_PEER_V6 update-source Loopback4096
22+
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2223
{% endif %}
2324
address-family ipv6
2425
{% if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
@@ -29,7 +30,6 @@
2930
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
3031
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
3132
neighbor INTERNAL_PEER_V6 send-community
32-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
3333
exit-address-family
3434
!
3535
! end of template: bgpd/templates/internal/peer-group.conf.j2

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

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1111
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1212
neighbor INTERNAL_PEER_V4 send-community
13-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1413
exit-address-family
1514
address-family ipv6
1615
neighbor INTERNAL_PEER_V6 route-reflector-client
@@ -19,7 +18,6 @@
1918
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
2019
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
2120
neighbor INTERNAL_PEER_V6 send-community
22-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2321
exit-address-family
2422
!
2523
! end of template: bgpd/templates/internal/peer-group.conf.j2

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
!
44
neighbor INTERNAL_PEER_V4 peer-group
55
neighbor INTERNAL_PEER_V6 peer-group
6-
neighbor INTERNAL_PEER_V4 update-source Loopback4096
6+
neighbor INTERNAL_PEER_V4 update-source Loopback4096
7+
neighbor INTERNAL_PEER_V4 ttl-security hops 1
78
address-family ipv4
89
neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
910
neighbor INTERNAL_PEER_V4 allowas-in 1
1011
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1112
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1213
neighbor INTERNAL_PEER_V4 send-community
13-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1414
exit-address-family
15-
neighbor INTERNAL_PEER_V6 update-source Loopback4096
15+
neighbor INTERNAL_PEER_V6 update-source Loopback4096
16+
neighbor INTERNAL_PEER_V6 ttl-security hops 1
1617
address-family ipv6
1718
neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
1819
neighbor INTERNAL_PEER_V6 allowas-in 1
1920
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
2021
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
2122
neighbor INTERNAL_PEER_V6 send-community
22-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2323
exit-address-family
2424
!
2525
! end of template: bgpd/templates/internal/peer-group.conf.j2

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
!
44
neighbor INTERNAL_PEER_V4 peer-group
55
neighbor INTERNAL_PEER_V6 peer-group
6-
neighbor INTERNAL_PEER_V4 update-source Loopback4096
6+
neighbor INTERNAL_PEER_V4 update-source Loopback4096
7+
neighbor INTERNAL_PEER_V4 ttl-security hops 1
78
address-family ipv4
89
neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
910
neighbor INTERNAL_PEER_V4 allowas-in 1
1011
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1112
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1213
neighbor INTERNAL_PEER_V4 send-community
13-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1414
exit-address-family
15-
neighbor INTERNAL_PEER_V6 update-source Loopback4096
15+
neighbor INTERNAL_PEER_V6 update-source Loopback4096
16+
neighbor INTERNAL_PEER_V6 ttl-security hops 1
1617
address-family ipv6
1718
neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
1819
neighbor INTERNAL_PEER_V6 allowas-in 1
1920
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
2021
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
2122
neighbor INTERNAL_PEER_V6 send-community
22-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2323
exit-address-family
2424
!
2525
! end of template: bgpd/templates/internal/peer-group.conf.j2

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
!
44
neighbor INTERNAL_PEER_V4 peer-group
55
neighbor INTERNAL_PEER_V6 peer-group
6-
neighbor INTERNAL_PEER_V4 update-source Loopback4096
6+
neighbor INTERNAL_PEER_V4 update-source Loopback4096
7+
neighbor INTERNAL_PEER_V4 ttl-security hops 1
78
address-family ipv4
89
neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound
910
neighbor INTERNAL_PEER_V4 allowas-in 1
1011
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1112
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1213
neighbor INTERNAL_PEER_V4 send-community
13-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1414
exit-address-family
15-
neighbor INTERNAL_PEER_V6 update-source Loopback4096
15+
neighbor INTERNAL_PEER_V6 update-source Loopback4096
16+
neighbor INTERNAL_PEER_V6 ttl-security hops 1
1617
address-family ipv6
1718
neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
1819
neighbor INTERNAL_PEER_V6 allowas-in 1
1920
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
2021
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
2122
neighbor INTERNAL_PEER_V6 send-community
22-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2323
exit-address-family
2424
!
2525
! end of template: bgpd/templates/internal/peer-group.conf.j2

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

-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in
1010
neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out
1111
neighbor INTERNAL_PEER_V4 send-community
12-
neighbor INTERNAL_PEER_V4 ttl-security hops 1
1312
exit-address-family
1413
address-family ipv6
1514
neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound
1615
neighbor INTERNAL_PEER_V6 allowas-in 1
1716
neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in
1817
neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out
1918
neighbor INTERNAL_PEER_V6 send-community
20-
neighbor INTERNAL_PEER_V6 ttl-security hops 1
2119
exit-address-family
2220
!
2321
! end of template: bgpd/templates/internal/peer-group.conf.j2

0 commit comments

Comments
 (0)