Supports FRR-VRRP configuration

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

@@ -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

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

@@ -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
@@ -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]

dockers/docker-orchagent/critical_processes.j2

@@ -8,6 +8,7 @@ program:orchagent
 {% if is_fabric_asic == 0 %}
 program:portsyncd
 program:neighsyncd
+program:vrrpsyncd
 program:fdbsyncd
 program:vlanmgrd
 program:intfmgrd

dockers/docker-orchagent/supervisord.conf.j2

@@ -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

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

@@ -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