[frrcfgd] Support for FRR configuration based on config DB events

dockers/docker-fpm-frr/docker_init.sh

@@ -3,18 +3,46 @@
 mkdir -p /etc/frr
 mkdir -p /etc/supervisor/conf.d
 
-CFGGEN_PARAMS=" \
-    -d \
-    -y /etc/sonic/constants.yml \
-    -t /usr/share/sonic/templates/supervisord/frr_vars.j2 \
-    -t /usr/share/sonic/templates/supervisord/supervisord.conf.j2,/etc/supervisor/conf.d/supervisord.conf \
-    -t /usr/share/sonic/templates/bgpd/bgpd.conf.j2,/etc/frr/bgpd.conf \
-    -t /usr/share/sonic/templates/zebra/zebra.conf.j2,/etc/frr/zebra.conf \
-    -t /usr/share/sonic/templates/staticd/staticd.conf.j2,/etc/frr/staticd.conf \
-    -t /usr/share/sonic/templates/frr.conf.j2,/etc/frr/frr.conf \
-    -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
-    -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
-"
+MGMT_FRAMEWORK_CONFIG=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["frr_mgmt_framework_config"]'`
+CRIT_PROC_BACKUP="/usr/local/frr/supervisord/critical_processes.bak"
+if [ -n "$MGMT_FRAMEWORK_CONFIG" ] && [ "$MGMT_FRAMEWORK_CONFIG" == "true" ]; then
+    CFGGEN_PARAMS=" \
+        -d \
+        -y /etc/sonic/constants.yml \
+        -t /usr/share/sonic/templates/frr_vars.j2 \
+        -t /usr/local/frr/supervisord/supervisord.conf.j2,/etc/supervisor/conf.d/supervisord.conf \
+        -t /usr/local/frr/bgpd/bgpd.conf.j2,/etc/frr/bgpd.conf \
+        -t /usr/share/sonic/templates/zebra/zebra.conf.j2,/etc/frr/zebra.conf \
+        -t /usr/local/frr/staticd/staticd.conf.j2,/etc/frr/staticd.conf \
+        -t /usr/share/sonic/templates/frr.conf.j2,/etc/frr/frr.conf \
+        -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
+        -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
+        -t /usr/local/frr/bfdd/bfdd.conf.j2,/etc/frr/bfdd.conf \
+        -t /usr/local/frr/ospfd/ospfd.conf.j2,/etc/frr/ospfd.conf \
+    "
+    if [ ! -f $CRIT_PROC_BACKUP ]; then
+        mv /etc/supervisor/critical_processes $CRIT_PROC_BACKUP
+    fi
+    # change critical process list with those of enterprise release
+    cp /usr/local/frr/supervisord/critical_processes /etc/supervisor
+else
+    CFGGEN_PARAMS=" \
+        -d \
+        -y /etc/sonic/constants.yml \
+        -t /usr/share/sonic/templates/supervisord/frr_vars.j2 \
+        -t /usr/share/sonic/templates/supervisord/supervisord.conf.j2,/etc/supervisor/conf.d/supervisord.conf \
+        -t /usr/share/sonic/templates/bgpd/bgpd.conf.j2,/etc/frr/bgpd.conf \
+        -t /usr/share/sonic/templates/zebra/zebra.conf.j2,/etc/frr/zebra.conf \
+        -t /usr/share/sonic/templates/staticd/staticd.conf.j2,/etc/frr/staticd.conf \
+        -t /usr/share/sonic/templates/frr.conf.j2,/etc/frr/frr.conf \
+        -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
+        -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
+    "
+    if [ -f $CRIT_PROC_BACKUP ]; then
+        # restore original critical process list for community release
+        mv -f $CRIT_PROC_BACKUP /etc/supervisor/critical_processes
+    fi
+fi
 CONFIG_TYPE=$(sonic-cfggen $CFGGEN_PARAMS)
 
 update_default_gw()
@@ -53,6 +81,7 @@ if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
 elif [ "$CONFIG_TYPE" == "unified" ]; then
     echo "service integrated-vtysh-config" > /etc/frr/vtysh.conf
     rm -f /etc/frr/bgpd.conf /etc/frr/zebra.conf /etc/frr/staticd.conf
+    rm -f /etc/frr/bfdd.conf /etc/frr/ospfd.conf /etc/frr/pimd.conf
 fi
 
 chown -R frr:frr /etc/frr/

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)
+$(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK)
 
 $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)

rules/sonic-frr-mgmt-framework.dep

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

rules/sonic-frr-mgmt-framework.mk

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

src/sonic-frr-mgmt-framework/.gitignore

@@ -0,0 +1,12 @@
+.eggs/
+build/
+dist/
+*.egg-info/
+frrcfgd/*.pyc
+tests/*.pyc
+tests/__pycache__/
+.idea
+.coverage
+frrcfgd/__pycache__/
+venv
+tests/.coverage*