Skip to content

Supports FRR-VRRP configuration #18617

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

Open
micas-net wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Supports FRR-VRRP configuration #18617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
402d685
Supports FRR-VRRP configuration
micas-net Apr 10, 2024
de84639
update src/sonic-vrrpcfgd/vrrpcfgd/vrrpcfgd.py
micas-net Apr 17, 2024
c0c924e
Update test_config.py
micas-net Apr 22, 2024
b3f4e6c
run vrrpmgrd on frr container
micas-net Apr 29, 2024
c60a6a2
Merge branch 'master' into master-Vrrp
micas-net May 6, 2024
8e90332
Rename 0034-support-vrrp6-commands-and-tracking-interface.patch to 00…
micas-net May 6, 2024
4cc0d8e
Merge branch 'master' into master-Vrrp
micas-net Jul 26, 2024
212f0a4
Rename 0028-support-vrrp6-commands-and-tracking-interface.patch to 00…
micas-net Jul 26, 2024
38c3563
Change the name of vrrpmgrd to macvlanmgrd
micas-net Jul 30, 2024
903470d
update vrrp patch
micas-net Aug 12, 2024
d41202f
Merge branch 'master' into master-Vrrp
micas-net Aug 12, 2024
2485aab
Rename 0053-support-vrrp6-commands-and-tracking-interface.patch to 00…
micas-net Sep 10, 2024
6f417ca
Merge branch 'master' into master-Vrrp
micas-net Sep 10, 2024
3d4fff0
del vrrpcfgd
micas-net Sep 27, 2024
2c70c75
Merge branch 'master' into master-Vrrp
micas-net Oct 8, 2024
8b5bffd
add vrrpsyncd to swss container
micas-net Oct 10, 2024
97eda69
triggle rebuild
micas-net Oct 23, 2024
a7c6f9a
Update frrcfgd.py
micas-net Oct 23, 2024
65aa4bd
Revert "Change the name of vrrpmgrd to macvlanmgrd"
micas-net Oct 24, 2024
646ec99
fix zebra coredump
micas-net Oct 31, 2024
e2629c3
update supervisord
micas-net Oct 31, 2024
0bf2f23
update supervisord.conf.j2
micas-net Oct 31, 2024
a99972f
triggle rebuild
micas-net Oct 31, 2024
e8f3e5e
triggle rebuild
micas-net Nov 6, 2024
8393781
triggle rebuild
micas-net Nov 6, 2024
51ae53a
triggle rebuild
micas-net Nov 8, 2024
6d61860
Merge branch 'master' into master-Vrrp
micas-net Nov 19, 2024
51c834c
triggle rebuild
micas-net Nov 26, 2024
90c9034
update frr patch
micas-net Dec 26, 2024
70a2255
Merge branch 'master' into master-Vrrp
micas-net Dec 26, 2024
6a9a6c0
Update 0077-support-vrrp6-commands-and-tracking-interface.patch
micas-net Feb 18, 2025
b44de23
Merge branch 'master' into master-Vrrp
micas-net Feb 18, 2025
8a6fa90
Rename 0077-support-vrrp6-commands-and-tracking-interface.patch to 00…
micas-net Feb 18, 2025
58ab987
Update 0081-support-vrrp6-commands-and-tracking-interface.patch
micas-net Feb 18, 2025
e4278ad
Update 0081-support-vrrp6-commands-and-tracking-interface.patch
micas-net Feb 19, 2025
4f196aa
Merge branch 'master' into master-Vrrp
micas-net Mar 31, 2025
187c3b7
Rename 0081-support-vrrp6-commands-and-tracking-interface.patch to 00…
micas-net Mar 31, 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
2 changes: 2 additions & 0 deletions dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ program:staticd
program:bgpd
program:fpmsyncd
{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
program:vrrpd
program:vrrmgrd
program:bfdd
program:ospfd
program:pimd
Expand Down
23 changes: 23 additions & 0 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 @@ -82,6 +82,18 @@ dependent_startup=true
dependent_startup_wait_for=zsocket:exited

{% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
[program:vrrpd]
command=/usr/lib/frr/vrrpd -A 127.0.0.1
priority=4
stopsignal=KILL
autostart=false
autorestart=false
startsecs=0
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=zebra:running

[program:bfdd]
command=/usr/lib/frr/bfdd -A 127.0.0.1 -P 0
priority=4
Expand Down Expand Up @@ -143,6 +155,17 @@ stderr_logfile=NONE
stderr_syslog=true
dependent_startup=true
dependent_startup_wait_for=zebra:running

[program:vrrpmgrd]
command=vrrpmgrd
priority=6
autostart=false
autorestart=false
startsecs=0
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=vrrpd:running
{% endif %}

[program:fpmsyncd]
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-orchagent/critical_processes.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ program:orchagent
{% if is_fabric_asic == 0 %}
program:portsyncd
program:neighsyncd
program:vrrpsyncd
program:fdbsyncd
program:vlanmgrd
program:intfmgrd
Expand Down
15 changes: 15 additions & 0 deletions dockers/docker-orchagent/supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,21 @@ environment=ASAN_OPTIONS="log_path=/var/log/asan/neighsyncd-asan.log{{ asan_extr
{% endif %}
{%- endif %}

{% if is_fabric_asic == 0 %}
[program:vrrpsyncd]
command=/usr/bin/vrrpsyncd
priority=7
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/vrrpsyncd-asan.log{{ asan_extra_options }}"
{% endif %}
{%- endif %}

{% if is_fabric_asic == 0 %}
[program:vlanmgrd]
command=/usr/bin/vlanmgrd
Expand Down
18 changes: 16 additions & 2 deletions files/image_config/copp/copp_cfg.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,17 @@
"red_action": "drop",
"trap_action": "trap",
"trap_priority": "1"

}
},
"queue2_group2": {
"cir":"300",
"cbs":"300",
"meter_type":"packets",
"mode":"sr_tcm",
"red_action":"drop",
"trap_action":"trap",
"trap_priority":"7",
"queue": "7"
}
},
"COPP_TRAP": {
"bgp": {
Expand Down Expand Up @@ -118,6 +127,11 @@
"trap_ids": "src_nat_miss,dest_nat_miss",
"trap_group": "queue1_group2"
},
"vrrp": {
"trap_ids": "vrrp,vrrpv6",
"trap_group": "queue2_group2",
"always_enabled": "true"
},
"sflow": {
"trap_group": "queue2_group1",
"trap_ids": "sample_packet"
Expand Down
2 changes: 1 addition & 1 deletion rules/docker-fpm-frr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG)

$(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp
$(DOCKER_FPM_FRR)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN
$(DOCKER_FPM_FRR)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN --cap-add=CAP_NET_ADMIN
$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro

Expand Down
Loading
Loading