Skip to content

[Not4Review] Update frr side config to enable bmp #20857

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

Closed
FengPan-Frank wants to merge 2 commits into from
Closed

[Not4Review] Update frr side config to enable bmp #20857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a164b4c
Update frr side config to enable bmp
FengPan-Frank Nov 19, 2024
e4f0c68
Merge branch 'master' into frr_bmp
FengPan-Frank Dec 9, 2024
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
3 changes: 0 additions & 3 deletions 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 @@ -88,8 +88,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
{% endif %}
!
{# set bmp info #}
{% if (FEATURE is defined) and ('bmp' in FEATURE) and ('state' in FEATURE['bmp']) and (FEATURE['bmp']['state'] == 'enabled') %}
!
bmp mirror buffer-limit 4294967214
!
Expand All @@ -100,7 +98,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
{% endif %}
{# set router-id #}
{% if DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or DEVICE_METADATA['localhost']['switch_type'] == 'voq' or DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
{% if 'bgp_router_id' in DEVICE_METADATA['localhost'] %}
Expand Down
4 changes: 0 additions & 4 deletions dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,7 @@ dependent_startup_wait_for=zebra:running
{% endif %}

[program:bgpd]
{% if FEATURE is defined and FEATURE.bmp is defined and FEATURE.bmp.state is defined and FEATURE.bmp.state == "enabled" %}
command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp -M bmp
Copy link
Collaborator

@qiluo-msft qiluo-msft Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-M bmp

If the feature is disabled, this change still has performance impact or maybe regression to FRR. Please consider FEATURE table for j2 rendering.

Copy link
Contributor Author

@FengPan-Frank FengPan-Frank Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to #20895 instead.

{% else %}
command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
{% endif %}
priority=5
stopsignal=KILL
autostart=false
Expand Down
9 changes: 9 additions & 0 deletions 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 @@ -44,6 +44,15 @@ router bgp 55555
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
bgp router-id 55.55.55.55
!
Expand Down
9 changes: 9 additions & 0 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ router bgp 55555
bgp suppress-fib-pending
no bgp default ipv4-unicast
no bgp ebgp-requires-policy
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
bgp router-id 55.55.55.55
!
Expand Down
9 changes: 9 additions & 0 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ router bgp 55555
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
network 55.55.55.56/32 route-map HIDE_INTERNAL
!
Expand Down
9 changes: 9 additions & 0 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/lo0_ipv6_only_router_id.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ router bgp 55555
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
bgp router-id 8.8.8.8
!
Expand Down
9 changes: 9 additions & 0 deletions ...pcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_ipv6_lo4096_router_id.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ router bgp 55555
!
bgp bestpath as-path multipath-relax
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 8.8.8.8
!
Expand Down
9 changes: 9 additions & 0 deletions src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis_router_id.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ router bgp 55555
!
bgp bestpath as-path multipath-relax
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 8.8.8.8
!
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ router bgp 65100
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 10.1.0.32
!
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ router bgp 65100
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 10.1.0.32
!
Expand Down
10 changes: 10 additions & 0 deletions 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,6 +59,16 @@ router bgp 65100
!
bgp bestpath as-path multipath-relax
!
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 8.0.0.5
!
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ router bgp 65100
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 10.1.0.32
!
Expand Down
10 changes: 10 additions & 0 deletions 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,6 +59,16 @@ router bgp 65100
!
bgp bestpath as-path multipath-relax
!
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 10.1.0.32
!
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/frr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ router bgp 65100
bgp graceful-restart
bgp graceful-restart preserve-fw-state
bgp graceful-restart select-defer-time 45
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 10.1.0.32
!
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ router bgp 4000
!
bgp bestpath as-path multipath-relax
!
!
!
bmp mirror buffer-limit 4294967214
!
bmp targets sonic-bmp
bmp stats interval 1000
bmp monitor ipv4 unicast pre-policy
bmp monitor ipv6 unicast pre-policy
bmp connect 127.0.0.1 port 5000 min-retry 1000 max-retry 2000
!
!
bgp router-id 4.0.0.0
!
Expand Down