upgrade FRR to version 10.0.1, upgrade libyang2 to 2.1.148. Tested us…

…ing basic BGP neighborship formation with routes using BGP docker
sonic-net · Nov 8, 2024 · ba72f6b · ba72f6b
1 parent 54b137c
commit ba72f6b
Show file tree

Hide file tree

Showing 31 changed files with 2,205 additions and 1,387 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -46,7 +46,7 @@
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/sonic-net/sonic-frr.git
-	branch = frr/8.5
+	branch = frr-10.0.1
 [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

diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -29,6 +29,17 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
 
+[program:mgmtd]
+command=/usr/lib/frr/mgmtd -A 127.0.0.1
+priority=4
+autostart=false
+autorestart=true
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+
 [program:zebra]
 command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_sonic -M snmp --asic-offload=notify_on_offload
 priority=4

diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -67,7 +67,9 @@ RUN apt-get install -y net-tools \
                        # For libkrb5-dev
                        comerr-dev \
                        libgssrpc4 \
-                       libkdb5-10
+                       libkdb5-10 \
+                       libprotobuf-c-dev \
+                       protobuf-c-compiler
 
 RUN apt-get install -y -t bullseye-backports iproute2
 

diff --git a/platform/vs/docker-sonic-vs/supervisord.conf.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2
@@ -163,6 +163,14 @@ stderr_logfile=syslog
 environment=ASAN_OPTIONS="log_path=/var/log/asan/teammgrd-asan.log{{ asan_extra_options }}"
 {% endif %}
 
+[program:mgmtd]
+command=/usr/lib/frr/mgmtd -A 127.0.0.1
+priority=13
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
 [program:zebra]
 command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_sonic --asic-offload=notify_on_offload
 priority=13

diff --git a/platform/vs/tests/bgp/files/invalid_nexthop/bgpd.conf b/platform/vs/tests/bgp/files/invalid_nexthop/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 65501
   bgp router-id 1.1.1.1
+  bgp allow-martian-nexthop
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
   neighbor fc00::2 remote-as 65502

diff --git a/rules/frr.mk b/rules/frr.mk
@@ -1,9 +1,9 @@
 # FRRouting (frr) package
 
-FRR_VERSION = 8.5.4
+FRR_VERSION = 10.0.1
 FRR_SUBVERSION = 0
-FRR_BRANCH = frr/8.5
-FRR_TAG = frr-8.5.4
+FRR_BRANCH = frr-10.0.1
+FRR_TAG = frr-10.0.1
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 

diff --git a/rules/libyang2.mk b/rules/libyang2.mk
@@ -1,23 +1,23 @@
 # libyang2
 
-LIBYANG2_VERSION_BASE = 2.0
-LIBYANG2_VERSION = $(LIBYANG2_VERSION_BASE).112
-LIBYANG2_SUBVERSION = 6
+LIBYANG2_VERSION_BASE = 2.1
+LIBYANG2_VERSION = $(LIBYANG2_VERSION_BASE).148
+LIBYANG2_SUBVERSION = 0.2
 LIBYANG2_FULLVERSION = $(LIBYANG2_VERSION)-$(LIBYANG2_SUBVERSION)
 
 export LIBYANG2_VERSION_BASE
 export LIBYANG2_VERSION
 export LIBYANG2_SUBVERSION
 export LIBYANG2_FULLVERSION
 
-LIBYANG2 = libyang2_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
+LIBYANG2 = libyang2t64_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(LIBYANG2)_SRC_PATH = $(SRC_PATH)/libyang2
 SONIC_MAKE_DEBS += $(LIBYANG2)
 
 LIBYANG2_DEV = libyang2-dev_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_DEV)))
 
-LIBYANG2_DBG = libyang2-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
+LIBYANG2_DBG = libyang2t64-dbgsym_$(LIBYANG2_FULLVERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG2),$(LIBYANG2_DBG)))
 
 

diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
@@ -144,6 +144,8 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
         libjson-c-dev \
         libsystemd-dev \
         libcmocka-dev \
+        libprotobuf-c-dev \
+        protobuf-c-compiler \
 #{%- if CROSS_BUILD_ENVIRON != "y" %}
         python3-all-dev \
         python3-all-dbg \
@@ -752,4 +754,4 @@ RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add armv7-unknown-linux-gnu
 RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add aarch64-unknown-linux-gnu && echo "[target.aarch64-unknown-linux-gnu]\nlinker = \"aarch64-linux-gnu-gcc\"" >> /.cargo/config.toml
 {% endif -%}
 ENV RUSTUP_HOME $RUST_ROOT
-ENV PATH $PATH:$RUST_ROOT/bin
+ENV PATH $PATH:$RUST_ROOT/bin
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
@@ -148,6 +148,8 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
         libsystemd-dev \
         python3-ipaddr \
         libcmocka-dev \
+        libprotobuf-c-dev \
+        protobuf-c-compiler \
 #{%- if CROSS_BUILD_ENVIRON != "y" %}
         python3-all-dev \
         python3-all-dbg \

diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
@@ -144,6 +144,8 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
         libsystemd-dev \
         python-ipaddr \
         libcmocka-dev \
+        libprotobuf-c-dev \
+        protobuf-c-compiler \
 {%- if CROSS_BUILD_ENVIRON != "y" %}
         python3-all-dev \
         python3-all-dbg \

diff --git a/src/libyang2/Makefile b/src/libyang2/Makefile
@@ -2,10 +2,10 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-LIBYANG_URL = https://sonicstorage.blob.core.windows.net/debian/pool/main/liby/libyang
+LIBYANG_URL = https://deb.debian.org/debian/pool/main/liby/libyang2
 
 DSC_FILE = libyang2_$(LIBYANG2_FULLVERSION).dsc
-ORIG_FILE = libyang2_$(LIBYANG2_VERSION).orig.tar.gz
+ORIG_FILE = libyang2_$(LIBYANG2_VERSION).orig.tar.xz
 DEBIAN_FILE = libyang2_$(LIBYANG2_FULLVERSION).debian.tar.xz
 
 DSC_FILE_URL = $(LIBYANG_URL)/$(DSC_FILE)
@@ -26,6 +26,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dpkg-source -x libyang2_$(LIBYANG2_FULLVERSION).dsc
 
 	pushd libyang2-$(LIBYANG2_VERSION)
+	#The package libyang2.1.148 is taken from debian trixie, which only has dpkg-dev version 1.21.22
+	#The bullseye package has dpkg-dev version 1.20.13
+	#The VS package has dpkg-dev version 1.19.8
+	sed -i 's/dpkg-dev (>= 1.22.5)/dpkg-dev (>= 1.19.8)/' debian/control
 	#sed -i 's/set(LIBYANG_MAJOR_SOVERSION 1)/set(LIBYANG_MAJOR_SOVERSION 2)/' CMakeLists.txt
 	#sed -i 's/libyang2/libyang2/' debian/libyang2.install
 	# Enable large file support for 32-bit arch

diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
@@ -36,6 +36,7 @@ endif
 ifeq ($(CROSS_BUILD_ENVIRON), y)
 	git reset --hard
 endif
+	git branch -f master origin/$(FRR_BRANCH)
 	git checkout master
 	git branch -D $(FRR_BRANCH)
 	popd