Skip to content

[pull] master from Azure:master #1626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 25, 2021
Merged

[pull] master from Azure:master #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
{% if multi_asic is defined %}
{% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") != 'None' %}
address-family ipv6
network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/64 route-map HIDE_INTERNAL
network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/128 route-map HIDE_INTERNAL
exit-address-family
{% endif %}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ router bgp 55555
network fc00::1/64
exit-address-family
address-family ipv6
network fc00::2/64 route-map HIDE_INTERNAL
network fc00::2/128 route-map HIDE_INTERNAL
exit-address-family
!
network 10.10.10.1/24
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ router bgp 55555
network fc00::1/64
exit-address-family
address-family ipv6
network fc00::2/64 route-map HIDE_INTERNAL
network fc00::2/128 route-map HIDE_INTERNAL
exit-address-family
!
network 10.10.10.1/24
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ router bgp 55555
network fc00::1/64
exit-address-family
address-family ipv6
network fc00::2/64 route-map HIDE_INTERNAL
network fc00::2/128 route-map HIDE_INTERNAL
exit-address-family
!
network 10.10.10.1/24
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ router bgp 55555
network fc00::1/64
exit-address-family
address-family ipv6
network fc00::2/64 route-map HIDE_INTERNAL
network fc00::2/128 route-map HIDE_INTERNAL
exit-address-family
!
network 10.10.10.1/24
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ router bgp 65100
network fc00:1::32/64
exit-address-family
address-family ipv6
network fd00:4::32/64 route-map HIDE_INTERNAL
network fd00:4::32/128 route-map HIDE_INTERNAL
exit-address-family
!
!
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ router bgp 65100
network fc00:1::32/64
exit-address-family
address-family ipv6
network fd00:1::32/64 route-map HIDE_INTERNAL
network fd00:1::32/128 route-map HIDE_INTERNAL
exit-address-family
!
!
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ router bgp 65100
network fc00:1::32/64
exit-address-family
address-family ipv6
network fd00:4::32/64 route-map HIDE_INTERNAL
network fd00:4::32/128 route-map HIDE_INTERNAL
exit-address-family
!
!
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ router bgp 65100
network fc00:1::32/64
exit-address-family
address-family ipv6
network fd00:1::32/64 route-map HIDE_INTERNAL
network fd00:1::32/128 route-map HIDE_INTERNAL
exit-address-family
!
!
Expand Down