FRR 4.0 integration with SONiC

.gitmodules

@@ -46,7 +46,7 @@
 	url = https://github.com/Azure/sonic-platform-daemons
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
-	url = https://github.com/FRRouting/frr.git
+	url = https://github.com/Azure/sonic-frr.git
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git

dockers/docker-fpm-frr/Dockerfile.j2

@@ -33,7 +33,8 @@ RUN rm -rf /debs ~/.cache
 COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["start.sh", "config.sh", "/usr/bin/"]
 COPY ["daemons", "/etc/frr/"]
-COPY ["debian.conf", "/etc/frr/"]
+COPY ["daemons.conf", "/etc/frr/"]
+COPY ["vtysh.conf", "/etc/frr/"]
 
 ENTRYPOINT /usr/bin/config.sh   \
         && /usr/bin/start.sh    \

dockers/docker-fpm-frr/config.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 mkdir -p /etc/frr
-sonic-cfggen -d -t /usr/share/sonic/templates/bgpd.conf.j2 >/etc/frr/bgpd.conf
-sonic-cfggen -d -t /usr/share/sonic/templates/zebra.conf.j2 >/etc/frr/zebra.conf
+sonic-cfggen -d -t /usr/share/sonic/templates/frr.conf.j2 >/etc/frr/frr.conf
 
 sonic-cfggen -d -t /usr/share/sonic/templates/isolate.j2 >/usr/sbin/bgp-isolate
 chown root:root /usr/sbin/bgp-isolate
@@ -12,10 +11,5 @@ sonic-cfggen -d -t /usr/share/sonic/templates/unisolate.j2 >/usr/sbin/bgp-unisol
 chown root:root /usr/sbin/bgp-unisolate
 chmod 0755 /usr/sbin/bgp-unisolate
 
-# If there's an integrated-config file, go ahead and remote it
-if [ -f /etc/frr/frr.conf ]; then
-    rm -rf /etc/frr/frr.conf
-fi
-
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

dockers/docker-fpm-frr/daemons

@@ -1,25 +1,25 @@
-# This file tells the quagga package which daemons to start.
+# This file tells the frr package which daemons to start.
 #
 # Entries are in the format: <daemon>=(yes|no|priority)
 #   0, "no"  = disabled
 #   1, "yes" = highest priority
 #   2 .. 10  = lower priorities
-# Read /usr/share/doc/quagga/README.Debian for details.
+# Read /usr/share/doc/frr/README.Debian for details.
 #
 # Sample configurations for these daemons can be found in
-# /usr/share/doc/quagga/examples/.
+# /usr/share/doc/frr/examples/.
 #
-# ATTENTION: 
+# ATTENTION:
 #
 # When activation a daemon at the first time, a config file, even if it is
-# empty, has to be present *and* be owned by the user and group "quagga", else
-# the daemon will not be started by /etc/init.d/quagga. The permissions should
+# empty, has to be present *and* be owned by the user and group "frr", else
+# the daemon will not be started by /etc/init.d/frr. The permissions should
 # be u=rw,g=r,o=.
 # When using "vtysh" such a config file is also needed. It should be owned by
-# group "quaggavty" and set to ug=rw,o= though. Check /etc/pam.d/quagga, too.
+# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
 #
-# The watchquagga daemon is always started. Per default in monitoring-only but
-# that can be changed via /etc/quagga/debian.conf.
+# The watchfrr daemon is always started. Per default in monitoring-only but
+# that can be changed via /etc/frr/daemons.conf.
 #
 zebra=yes
 bgpd=yes
@@ -28,4 +28,9 @@ ospf6d=no
 ripd=no
 ripngd=no
 isisd=no
+pimd=no
+ldpd=no
+nhrpd=no
+eigrpd=no
 babeld=no
+sharpd=no

dockers/docker-fpm-frr/debian.conf → dockers/docker-fpm-frr/daemons.conf

@@ -14,7 +14,15 @@ isisd_options="  --daemon -A 127.0.0.1"
 pimd_options="  --daemon -A 127.0.0.1"
 ldpd_options="  --daemon -A 127.0.0.1"
 nhrpd_options="  --daemon -A 127.0.0.1"
+eigrpd_options="  --daemon -A 127.0.0.1"
+babeld_options="  --daemon -A 127.0.0.1"
+sharpd_options="  --daemon -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
 watchfrr_enable=yes
-watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)
+watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30)
+
+# If valgrind_enable is 'yes' the frr daemons will be started via valgrind.
+# The use case for doing so is tracking down memory leaks, etc in frr.
+valgrind_enable=no
+valgrind=/usr/bin/valgrind