Supports FRR-VRRP configuration

dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2

@@ -2,11 +2,14 @@ program:zebra
 program:staticd
 program:bgpd
 program:fpmsyncd
+program:vrrpd
+program:macvlanmgrd
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 program:bfdd
 program:ospfd
 program:pimd
 program:frrcfgd
 {%- else %}
 program:bgpcfgd
+program:vrrpcfgd
 {%- endif %}

dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2

@@ -76,6 +76,18 @@ dependent_startup=true
 dependent_startup_wait_for=zebra:running
 {% endif %}
 
+[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:bgpd]
 command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
 priority=5
@@ -125,13 +137,31 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=bgpd:running
 
+[program:macvlanmgrd]
+command=macvlanmgrd
+priority=6
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=vrrpd:running
+
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 [program:frrcfgd]
 command=/usr/local/bin/frrcfgd
+priority=6
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=bgpd:running
 {% else %}
 [program:bgpcfgd]
 command=/usr/local/bin/bgpcfgd
-{% endif %}
 priority=6
 autostart=false
 autorestart=false
@@ -141,6 +171,18 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=bgpd:running
 
+[program:vrrpcfgd]
+command=/usr/local/bin/vrrpcfgd
+priority=6
+autostart=false
+autorestart=true
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=bgpd:running
+{% endif %}
+
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 {% else %}
 [program:staticroutebfd]

dockers/docker-orchagent/supervisord.conf.j2

@@ -302,3 +302,4 @@ dependent_startup_wait_for=swssconfig:exited
 environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_options }}"
 {% endif %}
 {%- endif %}
+

files/image_config/copp/copp_cfg.j2

@@ -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": {
@@ -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"

rules/docker-fpm-frr.mk

@@ -5,7 +5,7 @@ DOCKER_FPM_FRR = $(DOCKER_FPM_FRR_STEM).gz
 DOCKER_FPM_FRR_DBG = $(DOCKER_FPM_FRR_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/$(DOCKER_FPM_FRR_STEM)
-$(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK)
+$(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK) $(SONIC_VRRPCFGD)
 
 $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG2) $(SONIC_RSYSLOG_PLUGIN)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS)
@@ -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/timezone:/etc/timezone:ro
 

rules/sonic_vrrpcfgd.dep

@@ -0,0 +1,8 @@
+SPATH       := $($(SONIC_VRRPCFGD)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic_vrrpcfgd.mk rules/sonic_vrrpcfgd.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+DEP_FILES   += $(shell git ls-files $(SPATH))
+
+$(SONIC_VRRPCFGD)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SONIC_VRRPCFGD)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_VRRPCFGD)_DEP_FILES   := $(DEP_FILES)

rules/sonic_vrrpcfgd.mk

@@ -0,0 +1,13 @@
+# sonic-vrrpcfgd package
+
+SONIC_VRRPCFGD = sonic_vrrpcfgd-1.0-py3-none-any.whl
+$(SONIC_VRRPCFGD)_SRC_PATH = $(SRC_PATH)/sonic-vrrpcfgd
+# These dependencies are only needed because they are dependencies
+# of sonic-config-engine and vrrpcfgd explicitly calls sonic-cfggen
+# as part of its unit tests.
+# TODO: Refactor unit tests so that these dependencies are not needed
+
+$(SONIC_VRRPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3)
+$(SONIC_VRRPCFGD)_DEBS_DEPENDS += $(PYTHON_SWSSCOMMON)
+$(SONIC_VRRPCFGD)_PYTHON_VERSION = 3
+SONIC_PYTHON_WHEELS += $(SONIC_VRRPCFGD)