Merge branch 'sonic-net:master' into v2

sonic-net · Apr 19, 2023 · 30335a7 · 30335a7
2 parents 6dba697 + 03bf4ff
commit 30335a7
Show file tree

Hide file tree

Showing 59 changed files with 1,424 additions and 85 deletions.
diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh
@@ -69,4 +69,11 @@ else
     TELEMETRY_ARGS+=" -v=2"
 fi
 
+THRESHOLD_CONNECTIONS=$(echo $GNMI | jq -r '.threshold')
+if [[ $THRESHOLD_CONNECTIONS =~ ^[0-9]+$ ]]; then
+    TELEMETRY_ARGS+=" --threshold $THRESHOLD_CONNECTIONS"
+else
+    TELEMETRY_ARGS+=" --threshold 100"
+fi
+
 exec /usr/sbin/telemetry ${TELEMETRY_ARGS}
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye b/files/build/versions/build/build-sonic-slave-bullseye/versions-deb-bullseye
@@ -15,6 +15,8 @@ libnl-genl-3-dev==3.5.0-1
 libnl-nf-3-200==3.5.0-1
 libnl-nf-3-dev==3.5.0-1
 libnl-route-3-dev==3.5.0-1
+libsai==1.11.0-1
+libsai-dev==1.11.0-1
 libsaimetadata==1.0.0
 libsaimetadata-dev==1.0.0
 libsairedis==1.0.0

diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-arm64
@@ -1,5 +1,4 @@
 bitarray==1.5.3
 click==7.0
-redis==3.5.3
 requests==2.28.2
 zipp==1.2.0
diff --git a/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-bullseye/versions-py3-all-armhf
@@ -1,5 +1,4 @@
 bitarray==1.5.3
 click==7.0
-redis==3.5.3
 requests==2.28.2
 zipp==1.2.0
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-arm64
@@ -1,2 +1 @@
 bitarray==1.5.3
-redis==3.5.3
diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-py3-all-armhf
@@ -1,2 +1 @@
 bitarray==1.5.3
-redis==3.5.3
diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker
@@ -1,12 +1,12 @@
-amd64:amd64/debian:bullseye==sha256:d0bf7d85ad1e61ab3520b1d22d1e2a136799defd4e0d1e3f998d3b9045f38551
-amd64:amd64/debian:buster==sha256:ac8ad4307a275784e5fce8c832d1101b0fc8fd876e37f6fb2cb355c33ba456b1
-amd64:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721
-amd64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
-arm64:arm64v8/debian:bullseye==sha256:c7908b5cd3ce2969645bc08efd3940e1d145da5d935fb084e7fde00949a1ccb9
-arm64:arm64v8/debian:buster==sha256:a5f47fe848328e0744bfa9929bc07049f9f7fae244f6d3db9cfc7fb9d9db7899
-arm64:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721
-arm64:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
-armhf:arm32v7/debian:bullseye==sha256:c0eb6a0cc41c84db8f967a6708c136bf113cf4db37a6a7db0ec73f890ce725c5
-armhf:arm32v7/debian:buster==sha256:5a0917270fe6093c5a45ab4d4036ec167764f188778f3c20e78905219eedda12
-armhf:debian:bullseye==sha256:7b991788987ad860810df60927e1adbaf8e156520177bd4db82409f81dd3b721
-armhf:debian:buster==sha256:235f2a778fbc0d668c66afa9fd5f1efabab94c1d6588779ea4e221e1496f89da
+amd64:amd64/debian:bullseye==sha256:4effa16ae79ab36347d55ebb6bb4aad411077b72ad735054e684b3eeba373a35
+amd64:amd64/debian:buster==sha256:2803ab27dfe4f2e23b58d351e80e8d433942b6fb830225e6d034098ed450a169
+amd64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e
+amd64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+arm64:arm64v8/debian:bullseye==sha256:c0f6422141bb031238126fbd535c0df24db4252a2d9876216a94082df74c8fda
+arm64:arm64v8/debian:buster==sha256:55cd39723a057f730e9c33487fea9fe151bbe86dce51e92a73ccfd12206a1f43
+arm64:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e
+arm64:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
+armhf:arm32v7/debian:bullseye==sha256:ab0ce510343d33415fc4eaea0102da2d24cb720b185aaee0b411c48a07abb0de
+armhf:arm32v7/debian:buster==sha256:3e45d273ad15d7b648212c8faa5e236f6fdc694af7272b8c4bd25a5d90c27fe1
+armhf:debian:bullseye==sha256:0a78ed641b76252739e28ebbbe8cdbd80dc367fba4502565ca839e5803cfd86e
+armhf:debian:buster==sha256:173f0b19d2ac5ee17194dbe9a888a4a617dbf905ee666c9e780afad55eaf1d8c
diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git
@@ -1,11 +1,11 @@
-https://chromium.googlesource.com/chromium/tools/depot_tools.git==a896d5a92c67c826de7cb0a0afc96111614e40fd
+https://chromium.googlesource.com/chromium/tools/depot_tools.git==97dadd025f541f67af48417cc12ebdc00c1ad29c
 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
 https://github.com/CESNET/libyang.git==9a4e5b2ce30b9696116d6e654ee55caab5aafed8
 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
 https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
-https://github.com/flashrom/flashrom.git==3eaef7528b622955a48611fdc0801ca853665efd
-https://github.com/FreeRADIUS/freeradius-server.git==1b659443e6097835692be30d3d366eabd2d6077f
+https://github.com/flashrom/flashrom.git==f3c21c6439f8bbd2911f120c55f301982ecd35bc
+https://github.com/FreeRADIUS/freeradius-server.git==e5b1300b60a383659b3c7fca598e9c267f617dd1
 https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0
 https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
 https://github.com/jpirko/libteam.git==61e27812c1074a865d7e1a778c0ce442837c28d7
@@ -21,4 +21,4 @@ https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb4
 https://salsa.debian.org/kernel-team/ethtool/==68409b09a969b49a07fbf3930409f155b953434b
 https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80
 https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
-https://salsa.debian.org/ssh-team/openssh.git==49836a13815efec2773fbd76d34189424a26fb20
+https://salsa.debian.org/ssh-team/openssh.git==4cb9ac54235e8f90a590a976e1404480fb521930
diff --git a/files/build/versions/default/versions-mirror b/files/build/versions/default/versions-mirror
@@ -1,15 +1,15 @@
 deb.nodesource.com_node%5f14.x_dists_bullseye==2023-02-17T00:35:28Z
 deb.nodesource.com_node%5f14.x_dists_buster==2023-02-17T00:35:28Z
-debian==20230411T000410Z
-debian-security==20230411T000232Z
-download.docker.com_linux_debian_dists_bullseye==2023-04-11T20:00:38Z
-download.docker.com_linux_debian_dists_buster==2023-04-04T23:38:54Z
+debian==20230416T000236Z
+debian-security==20230416T000621Z
+download.docker.com_linux_debian_dists_bullseye==2023-04-14T12:24:31Z
+download.docker.com_linux_debian_dists_buster==2023-04-14T12:24:31Z
 packages.microsoft.com_repos_sonic-dev_dists_jessie==2022-10-31T19:34:29Z
-packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_bullseye-security==2023-04-10T18:02:36Z
-packages.trafficmanager.net_snapshot_debian-security_20230411T000232Z_dists_buster_updates==2023-04-10T18:02:36Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye==2022-12-17T10:14:37Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-backports==2023-04-10T20:09:25Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_bullseye-updates==2023-04-10T20:09:25Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster==2022-09-10T11:30:54Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-backports==2023-04-10T20:09:25Z
-packages.trafficmanager.net_snapshot_debian_20230411T000410Z_dists_buster-updates==2023-04-10T20:09:25Z
+packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_bullseye-security==2023-04-14T16:32:44Z
+packages.trafficmanager.net_snapshot_debian-security_20230416T000621Z_dists_buster_updates==2023-04-14T16:32:44Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye==2022-12-17T10:14:37Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-backports==2023-04-15T20:12:30Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_bullseye-updates==2023-04-15T20:12:30Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster==2022-09-10T11:30:54Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-backports==2023-04-15T20:12:30Z
+packages.trafficmanager.net_snapshot_debian_20230416T000236Z_dists_buster-updates==2023-04-15T20:12:30Z
diff --git a/files/build/versions/dockers/docker-base-bullseye/versions-py3 b/files/build/versions/dockers/docker-base-bullseye/versions-py3
@@ -1,7 +1,7 @@
 j2cli==0.3.10
 jinja2==3.1.2
 markupsafe==2.1.2
-pip==23.0.1
+pip==23.1
 setuptools==49.6.0
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0

diff --git a/files/build/versions/dockers/docker-base-buster/versions-py3 b/files/build/versions/dockers/docker-base-buster/versions-py3
@@ -1,7 +1,7 @@
 j2cli==0.3.10
 jinja2==3.1.2
 markupsafe==2.1.2
-pip==23.0.1
+pip==23.1
 setuptools==49.6.0
 supervisor==4.2.1
 supervisord-dependent-startup==1.4.0

diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-py3 b/files/build/versions/dockers/docker-config-engine-buster/versions-py3
@@ -1,7 +1,7 @@
 async-timeout==4.0.2
 bitarray==1.5.3
 ijson==2.6.1
-importlib-metadata==6.3.0
+importlib-metadata==6.4.1
 ipaddress==1.0.23
 jsondiff==2.0.0
 lxml==4.9.1

diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3
@@ -1,4 +1,4 @@
-attrs==22.2.0
+attrs==23.1.0
 certifi==2017.4.17
 charset-normalizer==3.1.0
 click==8.1.3
@@ -18,7 +18,7 @@ openapi-schema-validator==0.4.4
 openapi-spec-validator==0.5.6
 pathable==0.4.3
 pkgutil_resolve_name==1.3.10
-protobuf==4.22.1
+protobuf==4.22.3
 pyrsistent==0.19.3
 python-dateutil==2.6.0
 requests==2.28.2

diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3
@@ -17,7 +17,7 @@ jsonpointer==2.3
 lazy-object-proxy==1.9.0
 m2crypto==0.38.0
 netifaces==0.10.9
-packaging==23.0
+packaging==23.1
 pexpect==4.8.0
 prefixed==0.7.0
 prettyprinter==0.18.0

diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64 b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-arm64
@@ -20,4 +20,3 @@ libxslt1-dev==1.1.34-4+deb11u1
 linux-headers-5.10.0-21-arm64==5.10.162-1
 linux-headers-arm64==5.10.162-1
 nodejs==14.21.3-deb-1nodesource1
-tzdata==2021a-1+deb11u9
diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf b/files/build/versions/dockers/sonic-slave-bullseye/versions-deb-bullseye-armhf
@@ -11,4 +11,3 @@ linux-headers-5.10.0-21-armmp==5.10.162-1
 linux-headers-armmp==5.10.162-1
 nasm==2.15.05-1
 nodejs==14.21.3-deb-1nodesource1
-tzdata==2021a-1+deb11u9
diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-py3 b/files/build/versions/dockers/sonic-slave-bullseye/versions-py3
@@ -45,7 +45,7 @@ markdown==3.3.4
 markupsafe==1.1.1
 mccabe==0.6.1
 mmh3==2.5.1
-mock==5.0.1
+mock==5.0.2
 mockredispy==2.9.3
 more-itertools==4.2.0
 mypy-extensions==0.4.3
@@ -57,7 +57,7 @@ parameterized==0.8.1
 parse==1.6.6
 pexpect==4.8.0
 pillow==9.4.0
-pip==23.0.1
+pip==23.1
 pluggy==0.13.0
 ptyprocess==0.7.0
 py==1.10.0
@@ -66,7 +66,7 @@ pyangbind==0.8.1
 pyasn1==0.4.8
 pyasn1-modules==0.2.1
 pycurl==7.43.0.6
-pyfakefs==5.2.1
+pyfakefs==5.2.2
 pygments==2.7.1
 pygobject==3.38.0
 pyhamcrest==1.9.0

diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster
@@ -1115,7 +1115,6 @@ libswscale5==7:4.1.10-0+deb10u1
 libsynctex2==2018.20181218.49446-1
 libsys-hostname-long-perl==1.5-1
 libsystemd-dev==241-7~deb10u9
-libsystemd0==241-7~deb10u9
 libtag1v5==1.11.1+dfsg.1-0.3+deb10u1
 libtag1v5-vanilla==1.11.1+dfsg.1-0.3+deb10u1
 libtask-weaken-perl==1.06-1
@@ -1157,7 +1156,6 @@ libtypes-serialiser-perl==1.0-1
 libubsan1==8.3.0-6
 libuchardet0==0.0.6-3
 libudev-dev==241-7~deb10u9
-libudev1==241-7~deb10u9
 libunbound8==1.9.0-2+deb10u3
 libunicode-utf8-perl==0.62-1
 libunwind-dev==1.2.1-10~deb10u1

diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3
@@ -20,7 +20,7 @@ gcovr==4.1
 gpg==1.12.0
 idna==2.6
 imagesize==1.0.0
-importlib-metadata==6.3.0
+importlib-metadata==6.4.1
 jinja2==3.0.3
 keyring==17.1.1
 keyrings.alt==3.1.1
@@ -41,15 +41,15 @@ parameterized==0.8.1
 pbr==4.2.0
 pexpect==4.8.0
 pillow==9.4.0
-pip==23.0.1
+pip==23.1
 pluggy==0.8.0
 ptyprocess==0.7.0
 py==1.7.0
 pyang==2.4.0
 pyangbind==0.8.1
 pycrypto==2.6.1
 pycurl==7.43.0.2
-pyfakefs==5.2.1
+pyfakefs==5.2.2
 pygments==2.3.1
 pygobject==3.30.4
 pympler==0.8

diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3
@@ -9,7 +9,7 @@ charset-normalizer==3.1.0
 click==7.0
 click-log==0.4.0
 colorful==0.5.5
-cryptography==40.0.1
+cryptography==40.0.2
 dbus-python==1.2.16
 docker==5.0.3
 docker-image-py==0.1.12
@@ -37,7 +37,7 @@ netifaces==0.11.0
 pathtools==0.1.2
 pddf-platform==1.0
 pexpect==4.8.0
-pip==23.0.1
+pip==23.1
 prefixed==0.7.0
 prettyprinter==0.18.0
 protobuf==3.20.3

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -441,6 +441,11 @@ sudo cp $IMAGE_CONFIGS/corefile_uploader/core_uploader.py $FILESYSTEM_ROOT/usr/b
 sudo cp $IMAGE_CONFIGS/corefile_uploader/core_analyzer.rc.json $FILESYSTEM_ROOT_ETC_SONIC/
 sudo chmod og-rw $FILESYSTEM_ROOT_ETC_SONIC/core_analyzer.rc.json
 
+# Rasdaemon service configuration. Use timer to start rasdaemon with a delay for better fast/warm boot performance
+sudo cp $IMAGE_CONFIGS/rasdaemon/rasdaemon.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl disable rasdaemon.service
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT systemctl enable rasdaemon.timer
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install libffi-dev libssl-dev
 
 {% if include_bootchart == 'y' %}

diff --git a/files/image_config/rasdaemon/rasdaemon.timer b/files/image_config/rasdaemon/rasdaemon.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Delays rasdaemon until SONiC has started
+
+[Timer]
+OnUnitActiveSec=0 sec
+OnBootSec=1min 30 sec
+Unit=rasdaemon.service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/image_config/warmboot-finalizer/finalize-warmboot.sh b/files/image_config/warmboot-finalizer/finalize-warmboot.sh
@@ -112,6 +112,7 @@ function finalize_fast_reboot()
 {
     debug "Finalizing fast-reboot..."
     sonic-db-cli STATE_DB hset "FAST_RESTART_ENABLE_TABLE|system" "enable" "false" &>/dev/null
+    sonic-db-cli CONFIG_DB DEL "WARM_RESTART|teamd" &>/dev/null
 }
 
 function stop_control_plane_assistant()
@@ -170,10 +171,6 @@ if [[ (x"${WARM_BOOT}" == x"true") && (x"${FAST_REBOOT}" != x"true") ]]; then
    stop_control_plane_assistant
 fi
 
-# Save DB after stopped control plane assistant to avoid extra entries
-debug "Save in-memory database after warm/fast reboot ..."
-config save -y
-
 if [[ -n "${list}" ]]; then
     debug "Some components didn't finish reconcile: ${list} ..."
 fi
@@ -184,4 +181,8 @@ fi
 
 if [ x"${WARM_BOOT}" == x"true" ]; then
     finalize_warm_boot
-fi
+fi
+
+# Save DB after stopped control plane assistant to avoid extra entries
+debug "Save in-memory database after warm/fast reboot ..."
+config save -y
diff --git a/platform/innovium/docker-syncd-invm-rpc.mk b/platform/innovium/docker-syncd-invm-rpc.mk
@@ -2,7 +2,8 @@
 
 DOCKER_SYNCD_INVM_RPC = docker-syncd-invm-rpc.gz
 $(DOCKER_SYNCD_INVM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-invm-rpc
-$(DOCKER_SYNCD_INVM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(INVM_LIBSAI) $(PTF)
+$(DOCKER_SYNCD_INVM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(INVM_LIBSAI) $(PTF) $(INVM_SHELL)
+$(DOCKER_SYNCD_INVM_RPC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 $(DOCKER_SYNCD_INVM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC)
 SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_INVM_RPC)

diff --git a/platform/innovium/docker-syncd-invm.mk b/platform/innovium/docker-syncd-invm.mk
@@ -3,7 +3,7 @@
 DOCKER_SYNCD_PLATFORM_CODE = invm
 include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
 
-$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(INVM_LIBSAI)
+$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD) $(PYTHON_SDK_API) $(INVM_LIBSAI) $(INVM_SHELL)
 
 $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                 $(LIBSWSSCOMMON_DBG) \
@@ -13,7 +13,6 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
 SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_BASE)
 SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SYNCD_BASE_DBG)
 
-
 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_BASE)_MACHINE = innovium

diff --git a/platform/innovium/invm-sai.mk b/platform/innovium/invm-sai.mk
@@ -5,11 +5,13 @@ INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/master
 INVM_LIBSAI = isai.deb
 INVM_HSAI   = saihdr.deb
 INVM_DRV    = ipd.deb
+INVM_SHELL  = ishell.deb
 
 $(INVM_LIBSAI)_URL = $(INVM_SAI_ONLINE)/$(INVM_LIBSAI)
 $(INVM_HSAI)_URL   =  $(INVM_SAI_ONLINE)/$(INVM_HSAI)
 $(INVM_DRV)_URL    =  $(INVM_SAI_ONLINE)/$(INVM_DRV)
+$(INVM_SHELL)_URL  =  $(INVM_SAI_ONLINE)/$(INVM_SHELL)
 
 $(eval $(call add_conflict_package,$(INVM_HSAI),$(LIBSAIVS_DEV)))
 
-SONIC_ONLINE_DEBS  += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV)
+SONIC_ONLINE_DEBS  += $(INVM_LIBSAI) $(INVM_HSAI) $(INVM_DRV) $(INVM_SHELL)
diff --git a/platform/innovium/rules.mk b/platform/innovium/rules.mk
@@ -15,7 +15,7 @@ SONIC_ALL += $(SONIC_INVM_ONE_IMAGE) \
              $(DOCKER_SYNCD_INVM_RPC)
 
 # Inject invm sai into syncd
-$(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM)
+$(SYNCD)_DEPENDS += $(INVM_HSAI) $(INVM_LIBSAI) $(LIBSAITHRIFT_DEV_INVM) $(INVM_SHELL)
 $(SYNCD)_UNINSTALLS += $(INVM_HSAI)
 
 # Runtime dependency on invm sai is set only for syncd