Skip to content

Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid #22148

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
qiluo-msft merged 5 commits into from
Apr 4, 2025
Merged

Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid #22148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ded191e
Split frr_bmp feature switch for turn on FRR side bmp tunneling via
FengPan-Frank Mar 26, 2025
d18381f
Split frr_bmp feature switch for turn on FRR side bmp tunneling via
FengPan-Frank Mar 26, 2025
e8229f5
Merge branch 'frr_featureswitch' of https://github.com/FengPan-Frank/…
FengPan-Frank Apr 3, 2025
6d56656
Merge branch 'frr_featureswitch' of https://github.com/FengPan-Frank/…
FengPan-Frank Apr 3, 2025
7b0ec01
Merge branch 'frr_featureswitch' of https://github.com/FengPan-Frank/…
FengPan-Frank Apr 3, 2025
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
6 changes: 4 additions & 2 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,10 @@ 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') %}
{# set frr_bmp info #}
{% if (FEATURE is defined) and
(('frr_bmp' in FEATURE and 'state' in FEATURE['frr_bmp'] and FEATURE['frr_bmp']['state'] == 'enabled') or
('bmp' in FEATURE and 'state' in FEATURE['bmp'] and FEATURE['bmp']['state'] == 'enabled')) %}
!
bmp mirror buffer-limit 4294967214
!
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -98,7 +98,9 @@ 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" %}
{% if FEATURE is defined and
(FEATURE.frr_bmp is defined and FEATURE.frr_bmp.state is defined and FEATURE.frr_bmp.state == "enabled") or
(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 -P 0 -M snmp -M bmp
{% else %}
command=/usr/lib/frr/bgpd -A 127.0.0.1 -P 0 -M snmp
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/tests/test_frr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ def test_zebra_frr_dualtor(self):
self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr_dualtor.conf', extra_data=extra_data))

def test_bgpd_frr_bmp(self):
extra_data = {"FEATURE": {"bmp": {"state": "enabled"}}}
extra_data = {"FEATURE": {"frr_bmp": {"state": "enabled"}}}
self.assertTrue(*self.run_case('bgpd/bgpd.conf.j2', 'bgpd_frr_bmp.conf', extra_data=extra_data))
Loading